Merge remote branch 'kumar/next' into merge

[pandora-kernel.git] / arch / powerpc / boot / dts / mpc8308rdb.dts

diff --git a/arch/powerpc/boot/dts/mpc8308rdb.dts b/arch/powerpc/boot/dts/mpc8308rdb.dts
index a97eb2d..a0bd188 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8308rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8308rdb.dts
@@ -109,7 +109,7 @@
                #address-cells = <1>;
                #size-cells = <1>;
                device_type = "soc";
-               compatible = "fsl,mpc8315-immr", "simple-bus";
+               compatible = "fsl,mpc8308-immr", "simple-bus";
                ranges = <0 0xe0000000 0x00100000>;
                reg = <0xe0000000 0x00000200>;
                bus-frequency = <0>;
@@ -265,6 +265,14 @@
                        interrupt-parent = < &ipic >;
                };
 
+               dma@2c000 {
+                       compatible = "fsl,mpc8308-dma", "fsl,mpc5121-dma";
+                       reg = <0x2c000 0x1800>;
+                       interrupts = <3 0x8
+                                       94 0x8>;
+                       interrupt-parent = < &ipic >;
+               };
+
        };
 
        pci0: pcie@e0009000 {