powerpc: reserve two DMA channels for audio in MPC8610 HPCD device tree

The Freescale Elo DMA driver binds to all DMA channels in the device tree that
are compatible with "fsl,eloplus-dma-channel".  This conflicts with the sound
drivers for the MPC8610 HPCD.  On this board, the SSI uses two DMA channels and
therefore those channels are not available for general purpose use.  We
change the compatible properties for these channels "fsl,ssi-dma-channel".
This works because the sound drivers don't actually check the compatible
property when it grabs channels.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
index 0f3a36e0ea6d3d674f898cb7d4f2ffbd6fd63cfc..3f4c6102e4e1f7e08f1247c8e44059221a7a51de 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts
+++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
@@ -237,7 +237,7 @@
 
                        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>;
@@ -245,7 +245,7 @@
                        };
                        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>;