Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4922566f0394ac41c72fb960f22b4f84333026bc
Commit: 4922566f0394ac41c72fb960f22b4f84333026bc
Parent: af7baf9259c12cfbe927a674f3bd17d855d1e156
Author: Josh Boyer <[EMAIL PROTECTED]>
AuthorDate: Thu Dec 20 08:55:34 2007 -0600
Committer: Josh Boyer <[EMAIL PROTECTED]>
CommitDate: Sun Dec 23 13:28:40 2007 -0600
[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 <[EMAIL PROTECTED]>
---
arch/powerpc/boot/cuboot-rainier.c | 2 +-
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 6be15ca..cf452b6 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 5a01bef..ce8167b 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;
}
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
