diff options
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r-- | arch/powerpc/platforms/83xx/mpc831x_rdb.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/83xx/mpc837x_mds.c | 10 | ||||
-rw-r--r-- | arch/powerpc/platforms/83xx/mpc837x_rdb.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/platforms/83xx/mpc831x_rdb.c b/arch/powerpc/platforms/83xx/mpc831x_rdb.c index 91a2c80b9d7..0b4f883b20e 100644 --- a/arch/powerpc/platforms/83xx/mpc831x_rdb.c +++ b/arch/powerpc/platforms/83xx/mpc831x_rdb.c | |||
@@ -38,6 +38,8 @@ static void __init mpc831x_rdb_setup_arch(void) | |||
38 | #ifdef CONFIG_PCI | 38 | #ifdef CONFIG_PCI |
39 | for_each_compatible_node(np, "pci", "fsl,mpc8349-pci") | 39 | for_each_compatible_node(np, "pci", "fsl,mpc8349-pci") |
40 | mpc83xx_add_bridge(np); | 40 | mpc83xx_add_bridge(np); |
41 | for_each_compatible_node(np, "pci", "fsl,mpc8314-pcie") | ||
42 | mpc83xx_add_bridge(np); | ||
41 | #endif | 43 | #endif |
42 | mpc831x_usb_cfg(); | 44 | mpc831x_usb_cfg(); |
43 | } | 45 | } |
diff --git a/arch/powerpc/platforms/83xx/mpc837x_mds.c b/arch/powerpc/platforms/83xx/mpc837x_mds.c index 530ef990ca7..634785cc452 100644 --- a/arch/powerpc/platforms/83xx/mpc837x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc837x_mds.c | |||
@@ -84,14 +84,10 @@ static void __init mpc837x_mds_setup_arch(void) | |||
84 | ppc_md.progress("mpc837x_mds_setup_arch()", 0); | 84 | ppc_md.progress("mpc837x_mds_setup_arch()", 0); |
85 | 85 | ||
86 | #ifdef CONFIG_PCI | 86 | #ifdef CONFIG_PCI |
87 | for_each_compatible_node(np, "pci", "fsl,mpc8349-pci") { | 87 | for_each_compatible_node(np, "pci", "fsl,mpc8349-pci") |
88 | if (!of_device_is_available(np)) { | 88 | mpc83xx_add_bridge(np); |
89 | pr_warning("%s: disabled by the firmware.\n", | 89 | for_each_compatible_node(np, "pci", "fsl,mpc8314-pcie") |
90 | np->full_name); | ||
91 | continue; | ||
92 | } | ||
93 | mpc83xx_add_bridge(np); | 90 | mpc83xx_add_bridge(np); |
94 | } | ||
95 | #endif | 91 | #endif |
96 | mpc837xmds_usb_cfg(); | 92 | mpc837xmds_usb_cfg(); |
97 | } | 93 | } |
diff --git a/arch/powerpc/platforms/83xx/mpc837x_rdb.c b/arch/powerpc/platforms/83xx/mpc837x_rdb.c index 1d096545322..3d7b953d40e 100644 --- a/arch/powerpc/platforms/83xx/mpc837x_rdb.c +++ b/arch/powerpc/platforms/83xx/mpc837x_rdb.c | |||
@@ -38,6 +38,8 @@ static void __init mpc837x_rdb_setup_arch(void) | |||
38 | #ifdef CONFIG_PCI | 38 | #ifdef CONFIG_PCI |
39 | for_each_compatible_node(np, "pci", "fsl,mpc8349-pci") | 39 | for_each_compatible_node(np, "pci", "fsl,mpc8349-pci") |
40 | mpc83xx_add_bridge(np); | 40 | mpc83xx_add_bridge(np); |
41 | for_each_compatible_node(np, "pci", "fsl,mpc8314-pcie") | ||
42 | mpc83xx_add_bridge(np); | ||
41 | #endif | 43 | #endif |
42 | mpc837x_usb_cfg(); | 44 | mpc837x_usb_cfg(); |
43 | } | 45 | } |