hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[POWERPC] 85xx: Clean up from 85xx_ds rename 

Renamed functions in 85xx_ds from 8544 to 85xx.

Kept an unique machine def/probe for the MPC8544 DS board to
handle some subtle differences between the future board based
on the DS platform.

Also fixed building w/o CONFIG_PCI and minor whitespace fixes.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Kumar Gala 2007-08-17 09:26:40 -05:00
parent 16d24060d1
commit 7f50382dc8
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
arch/powerpc/platforms/85xx/mpc85xx_ds.c
View File

@ -1,5 +1,5 @@
/* /*
* MPC8544 DS Board Setup * MPC85xx DS Board Setup
* *
* Author Xianghua Xiao (x.xiao@freescale.com) * Author Xianghua Xiao (x.xiao@freescale.com)
* Roy Zang <tie-fei.zang@freescale.com> * Roy Zang <tie-fei.zang@freescale.com>
@ -44,7 +44,7 @@
#endif #endif
#ifdef CONFIG_PPC_I8259 #ifdef CONFIG_PPC_I8259
static void mpc8544_8259_cascade(unsigned int irq, struct irq_desc *desc) static void mpc85xx_8259_cascade(unsigned int irq, struct irq_desc *desc)
{ {
unsigned int cascade_irq = i8259_irq(); unsigned int cascade_irq = i8259_irq();
@ -55,7 +55,7 @@ static void mpc8544_8259_cascade(unsigned int irq, struct irq_desc *desc)
} }
#endif /* CONFIG_PPC_I8259 */ #endif /* CONFIG_PPC_I8259 */
void __init mpc8544_ds_pic_init(void) void __init mpc85xx_ds_pic_init(void)
{ {
struct mpic *mpic; struct mpic *mpic;
struct resource r; struct resource r;
@ -104,16 +104,17 @@ void __init mpc8544_ds_pic_init(void)
return; return;
} }
DBG("mpc8544ds: cascade mapped to irq %d\n", cascade_irq); DBG("mpc85xxds: cascade mapped to irq %d\n", cascade_irq);
i8259_init(cascade_node, 0); i8259_init(cascade_node, 0);
of_node_put(cascade_node); of_node_put(cascade_node);
set_irq_chained_handler(cascade_irq, mpc8544_8259_cascade); set_irq_chained_handler(cascade_irq, mpc85xx_8259_cascade);
#endif /* CONFIG_PPC_I8259 */ #endif /* CONFIG_PPC_I8259 */
} }
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static int primary_phb_addr;
extern int uses_fsl_uli_m1575; extern int uses_fsl_uli_m1575;
extern int uli_exclude_device(struct pci_controller *hose, extern int uli_exclude_device(struct pci_controller *hose,
u_char bus, u_char devfn); u_char bus, u_char devfn);
@ -121,13 +122,13 @@ extern int uli_exclude_device(struct pci_controller *hose,
static int mpc85xx_exclude_device(struct pci_controller *hose, static int mpc85xx_exclude_device(struct pci_controller *hose,
u_char bus, u_char devfn) u_char bus, u_char devfn)
{ {
struct device_node* node; struct device_node* node;
struct resource rsrc; struct resource rsrc;
node = (struct device_node *)hose->arch_data; node = (struct device_node *)hose->arch_data;
of_address_to_resource(node, 0, &rsrc); of_address_to_resource(node, 0, &rsrc);
if ((rsrc.start & 0xfffff) == 0xb000) { if ((rsrc.start & 0xfffff) == primary_phb_addr) {
return uli_exclude_device(hose, bus, devfn); return uli_exclude_device(hose, bus, devfn);
} }
@ -138,20 +139,20 @@ static int mpc85xx_exclude_device(struct pci_controller *hose,
/* /*
* Setup the architecture * Setup the architecture
*/ */
static void __init mpc8544_ds_setup_arch(void) static void __init mpc85xx_ds_setup_arch(void)
{ {
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
struct device_node *np; struct device_node *np;
#endif #endif
if (ppc_md.progress) if (ppc_md.progress)
ppc_md.progress("mpc8544_ds_setup_arch()", 0); ppc_md.progress("mpc85xx_ds_setup_arch()", 0);
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) { for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) {
struct resource rsrc; struct resource rsrc;
of_address_to_resource(np, 0, &rsrc); of_address_to_resource(np, 0, &rsrc);
if ((rsrc.start & 0xfffff) == 0xb000) if ((rsrc.start & 0xfffff) == primary_phb_addr)
fsl_add_bridge(np, 1); fsl_add_bridge(np, 1);
else else
fsl_add_bridge(np, 0); fsl_add_bridge(np, 0);
@ -160,7 +161,7 @@ static void __init mpc8544_ds_setup_arch(void)
ppc_md.pci_exclude_device = mpc85xx_exclude_device; ppc_md.pci_exclude_device = mpc85xx_exclude_device;
#endif #endif
printk("MPC8544 DS board from Freescale Semiconductor\n"); printk("MPC85xx DS board from Freescale Semiconductor\n");
} }
/* /*
@ -170,14 +171,21 @@ static int __init mpc8544_ds_probe(void)
{ {
unsigned long root = of_get_flat_dt_root(); unsigned long root = of_get_flat_dt_root();
return of_flat_dt_is_compatible(root, "MPC8544DS"); if (of_flat_dt_is_compatible(root, "MPC8544DS")) {
#ifdef CONFIG_PCI
primary_phb_addr = 0xb000;
#endif
return 1;
} else {
return 0;
}
} }
define_machine(mpc8544_ds) { define_machine(mpc8544_ds) {
.name = "MPC8544 DS", .name = "MPC8544 DS",
.probe = mpc8544_ds_probe, .probe = mpc8544_ds_probe,
.setup_arch = mpc8544_ds_setup_arch, .setup_arch = mpc85xx_ds_setup_arch,
.init_IRQ = mpc8544_ds_pic_init, .init_IRQ = mpc85xx_ds_pic_init,
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
.pcibios_fixup_bus = fsl_pcibios_fixup_bus, .pcibios_fixup_bus = fsl_pcibios_fixup_bus,
#endif #endif