diff options
| author | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2007-12-20 08:55:34 -0600 |
|---|---|---|
| committer | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2007-12-23 13:28:40 -0600 |
| commit | 4922566f0394ac41c72fb960f22b4f84333026bc (patch) | |
| tree | c75b2c3b7141f5216a01ea2a660fb36dee24f66c | |
| parent | af7baf9259c12cfbe927a674f3bd17d855d1e156 (diff) | |
| download | blackbird-op-linux-4922566f0394ac41c72fb960f22b4f84333026bc.tar.gz blackbird-op-linux-4922566f0394ac41c72fb960f22b4f84333026bc.zip | |
[POWERPC] 4xx: libfdt and pci fixes for Rainier
Update the Rainier wrapper for the libfdt merge and add the pci flags to the
platform file.
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
| -rw-r--r-- | arch/powerpc/boot/cuboot-rainier.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/44x/rainier.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/boot/cuboot-rainier.c b/arch/powerpc/boot/cuboot-rainier.c index 6be15cad2f7e..cf452b66dce8 100644 --- a/arch/powerpc/boot/cuboot-rainier.c +++ b/arch/powerpc/boot/cuboot-rainier.c @@ -51,6 +51,6 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5, CUBOOT_INIT(); platform_ops.fixups = rainier_fixups; platform_ops.exit = ibm44x_dbcr_reset; - ft_init(_dtb_start, 0, 32); + fdt_init(_dtb_start); serial_console_init(); } diff --git a/arch/powerpc/platforms/44x/rainier.c b/arch/powerpc/platforms/44x/rainier.c index 5a01bef21846..ce8167bb301f 100644 --- a/arch/powerpc/platforms/44x/rainier.c +++ b/arch/powerpc/platforms/44x/rainier.c @@ -20,6 +20,7 @@ #include <asm/time.h> #include <asm/uic.h> #include <asm/of_platform.h> +#include <asm/pci-bridge.h> #include "44x.h" static struct of_device_id rainier_of_bus[] = { @@ -47,6 +48,8 @@ static int __init rainier_probe(void) if (!of_flat_dt_is_compatible(root, "amcc,rainier")) return 0; + ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC; + return 1; } |
