Merge master.kernel.org:/home/rmk/linux-2.6-arm

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

diff --git a/arch/powerpc/boot/cuboot-8xx.c b/arch/powerpc/boot/cuboot-8xx.c
index 88ed84015a8badc2a21e8a79c7b4d4abd884649a..c202c8868bd6df3b3ad5e448e0d983dc0036098f 100644 (file)
--- a/arch/powerpc/boot/cuboot-8xx.c
+++ b/arch/powerpc/boot/cuboot-8xx.c
@@ -29,17 +29,19 @@ static void platform_fixups(void)
        dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 16, bd.bi_busfreq);
 
        node = finddevice("/soc/cpm");
-       if (node) {
+       if (node)
                setprop(node, "clock-frequency", &bd.bi_busfreq, 4);
-               setprop(node, "fsl,brg-frequency", &bd.bi_busfreq, 4);
-       }
+
+       node = finddevice("/soc/cpm/brg");
+       if (node)
+               setprop(node, "clock-frequency",  &bd.bi_busfreq, 4);
 }
 
 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;
 }