git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
85xx
/
mpc85xx_ds.c
diff --git
a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
index
dfd8b4a
..
00c5358
100644
(file)
--- a/
arch/powerpc/platforms/85xx/mpc85xx_ds.c
+++ b/
arch/powerpc/platforms/85xx/mpc85xx_ds.c
@@
-58,14
+58,13
@@
void __init mpc85xx_ds_pic_init(void)
{
struct mpic *mpic;
struct resource r;
{
struct mpic *mpic;
struct resource r;
- struct device_node *np
= NULL
;
+ struct device_node *np;
#ifdef CONFIG_PPC_I8259
struct device_node *cascade_node = NULL;
int cascade_irq;
#endif
#ifdef CONFIG_PPC_I8259
struct device_node *cascade_node = NULL;
int cascade_irq;
#endif
- np = of_find_node_by_type(np, "open-pic");
-
+ np = of_find_node_by_type(NULL, "open-pic");
if (np == NULL) {
printk(KERN_ERR "Could not find open-pic node\n");
return;
if (np == NULL) {
printk(KERN_ERR "Could not find open-pic node\n");
return;
@@
-78,9
+77,11
@@
void __init mpc85xx_ds_pic_init(void)
}
mpic = mpic_alloc(np, r.start,
}
mpic = mpic_alloc(np, r.start,
- MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
+ MPIC_PRIMARY | MPIC_WANTS_RESET |
+ MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS,
0, 256, " OpenPIC ");
BUG_ON(mpic == NULL);
0, 256, " OpenPIC ");
BUG_ON(mpic == NULL);
+ of_node_put(np);
mpic_init(mpic);
mpic_init(mpic);
@@
-114,7
+115,6
@@
void __init mpc85xx_ds_pic_init(void)
#ifdef CONFIG_PCI
static int primary_phb_addr;
#ifdef CONFIG_PCI
static int primary_phb_addr;
-extern int uses_fsl_uli_m1575;
extern int uli_exclude_device(struct pci_controller *hose,
u_char bus, u_char devfn);
extern int uli_exclude_device(struct pci_controller *hose,
u_char bus, u_char devfn);
@@
-160,7
+160,6
@@
static void __init mpc85xx_ds_setup_arch(void)
}
}
}
}
- uses_fsl_uli_m1575 = 1;
ppc_md.pci_exclude_device = mpc85xx_exclude_device;
#endif
ppc_md.pci_exclude_device = mpc85xx_exclude_device;
#endif
@@
-184,7
+183,7
@@
static int __init mpc8544_ds_probe(void)
}
}
}
}
-static struct of_device_id mpc85xxds_ids[] = {
+static struct of_device_id
__initdata
mpc85xxds_ids[] = {
{ .type = "soc", },
{ .compatible = "soc", },
{},
{ .type = "soc", },
{ .compatible = "soc", },
{},
@@
-195,6
+194,7
@@
static int __init mpc85xxds_publish_devices(void)
return of_platform_bus_probe(NULL, mpc85xxds_ids, NULL);
}
machine_device_initcall(mpc8544_ds, mpc85xxds_publish_devices);
return of_platform_bus_probe(NULL, mpc85xxds_ids, NULL);
}
machine_device_initcall(mpc8544_ds, mpc85xxds_publish_devices);
+machine_device_initcall(mpc8572_ds, mpc85xxds_publish_devices);
/*
* Called very early, device-tree isn't unflattened
/*
* Called very early, device-tree isn't unflattened