From: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Date: Thu, 20 Dec 2007 14:55:34 +0000 (-0600)
Subject: [POWERPC] 4xx: libfdt and pci fixes for Rainier
X-Git-Tag: v2.6.25-rc1~1131^2~163
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4922566f0394ac41c72fb960f22b4f84333026bc;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/arch/powerpc/boot/cuboot-rainier.c b/arch/powerpc/boot/cuboot-rainier.c
index 6be15cad2f7..cf452b66dce 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 5a01bef2184..ce8167bb301 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;
 }