1 --- a/arch/powerpc/boot/dts/rb600.dts
2 +++ b/arch/powerpc/boot/dts/rb600.dts
11 + bootargs = "console=ttyS0,115200 board=mpc8323 rootfstype=squashfs,yaffs2,jffs2 root=/dev/mtdblock1 boot=1";
12 linux,stdout-path = "/soc8343@e0000000/serial@4500";
20 + #address-cells = <1>;
22 + compatible = "fsl,mpc8349-dma", "fsl,elo-dma";
24 + ranges = <0 0x8100 0x1a8>;
25 + interrupt-parent = <&ipic>;
26 + interrupts = <71 8>;
29 + compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
32 + interrupt-parent = <&ipic>;
33 + interrupts = <71 8>;
36 + compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
39 + interrupt-parent = <&ipic>;
40 + interrupts = <71 8>;
43 + compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
46 + interrupt-parent = <&ipic>;
47 + interrupts = <71 8>;
50 + compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
53 + interrupt-parent = <&ipic>;
54 + interrupts = <71 8>;
58 enet0: ethernet@25000 {
61 --- a/arch/powerpc/boot/rb600.c 2010-04-01 07:46:37.000000000 +0300
62 +++ b/arch/powerpc/boot/rb600.c 2010-04-01 08:04:03.000000000 +0300
64 clock = fdt_getprop(fw_dtb, node, "clock-frequency", &size);
65 dt_fixup_cpu_clocks(*clock, *timebase, 0);
68 - * The bootloader reads the kernelparm segment and adds the content to
69 - * bootargs. This is needed to specify root and other boot flags.
71 - chosen = finddevice("/chosen");
72 - node = fdt_path_offset(fw_dtb, "/chosen");
73 - bootargs = fdt_getprop(fw_dtb, node, "bootargs", &size);
74 - setprop_str(chosen, "bootargs", bootargs);
77 void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
78 --- a/arch/powerpc/platforms/83xx/rbppc.c 2010-04-01 09:04:09.000000000 +0300
79 +++ b/arch/powerpc/platforms/83xx/rbppc.c 2010-04-01 09:02:00.000000000 +0300
81 static int beeper_irq;
82 static unsigned beeper_gpio_pin[2];
86 irqreturn_t rbppc_timer_irq(int irq, void *ptr)
88 static int toggle = 0;
95 #ifdef CONFIG_QUICC_ENGINE
106 void __init rbppc_init_IRQ(void)
113 #ifdef CONFIG_QUICC_ENGINE
114 np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic");
118 #endif /* CONFIG_QUICC_ENGINE */
124 static int __init rbppc_probe(void)
129 - if (strcmp(model, "RB333") == 0)
130 + if (strcmp(model, "RB333") == 0) {
135 if (strcmp(model, "RB600") == 0)