Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-2.6-omap-h63xx.git] / arch / powerpc / boot / cuboot-52xx.c

diff --git a/arch/powerpc/boot/cuboot-52xx.c b/arch/powerpc/boot/cuboot-52xx.c
index 9256a26d40e4c8f1033d72f976bd961f619e77ea..4c42ec8687be100c879242f6a3846640f1bc8b12 100644 (file)
--- a/arch/powerpc/boot/cuboot-52xx.c
+++ b/arch/powerpc/boot/cuboot-52xx.c
@@ -37,6 +37,10 @@ static void platform_fixups(void)
         * this can do a simple path lookup.
         */
        soc = find_node_by_devtype(NULL, "soc");
+       if (!soc)
+               soc = find_node_by_compatible(NULL, "fsl,mpc5200-immr");
+       if (!soc)
+               soc = find_node_by_compatible(NULL, "fsl,mpc5200b-immr");
        if (soc) {
                setprop(soc, "bus-frequency", &bd.bi_ipbfreq,
                        sizeof(bd.bi_ipbfreq));
@@ -53,7 +57,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                    unsigned long r6, unsigned long r7)
 {
        CUBOOT_INIT();
-       ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
+       fdt_init(_dtb_start);
        serial_console_init();
        platform_ops.fixups = platform_fixups;
 }