Merge branch 'linus' into core/urgent

[linux-2.6-omap-h63xx.git] / arch / powerpc / boot / dts / mpc8610_hpcd.dts

diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
index 584a4f184eb26cddbac0d50c7feb52f406ab7e05..f724d72c7b92db819d2b9229da620938ba6c0104 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts
+++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
@@ -207,7 +207,7 @@
                        reg = <0xe4000 0x100>;
                };
 
-               i2s@16000 {
+               ssi@16000 {
                        compatible = "fsl,mpc8610-ssi";
                        cell-index = <0>;
                        reg = <0x16000 0x100>;
@@ -215,6 +215,8 @@
                        interrupts = <62 2>;
                        fsl,mode = "i2s-slave";
                        codec-handle = <&cs4270>;
+                       fsl,playback-dma = <&dma00>;
+                       fsl,capture-dma = <&dma01>;
                };
 
                ssi@16100 {
@@ -233,17 +235,17 @@
                        reg = <0x21300 0x4>; /* DMA general status register */
                        ranges = <0x0 0x21100 0x200>;
 
-                       dma-channel@0 {
+                       dma00: dma-channel@0 {
                                compatible = "fsl,mpc8610-dma-channel",
-                                       "fsl,eloplus-dma-channel";
+                                       "fsl,ssi-dma-channel";
                                cell-index = <0>;
                                reg = <0x0 0x80>;
                                interrupt-parent = <&mpic>;
                                interrupts = <20 2>;
                        };
-                       dma-channel@1 {
+                       dma01: dma-channel@1 {
                                compatible = "fsl,mpc8610-dma-channel",
-                                       "fsl,eloplus-dma-channel";
+                                       "fsl,ssi-dma-channel";
                                cell-index = <1>;
                                reg = <0x80 0x80>;
                                interrupt-parent = <&mpic>;