aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimur Tabi <timur@freescale.com>2008-10-10 12:52:32 -0400
committerKumar Gala <galak@kernel.crashing.org>2008-10-13 12:10:00 -0400
commit7de0c22bba1f6117c3447af2cdca9904303012da (patch)
treee21b0945cf6ca13f6c550a91b95163e4518c2076
parentb56c2768d28425783f895971854577f412ae486f (diff)
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>
-rw-r--r--arch/powerpc/boot/dts/mpc8610_hpcd.dts4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
index 0f3a36e0ea6d..3f4c6102e4e1 100644
--- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts
+++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
@@ -237,7 +237,7 @@
237 237
238 dma00: dma-channel@0 { 238 dma00: dma-channel@0 {
239 compatible = "fsl,mpc8610-dma-channel", 239 compatible = "fsl,mpc8610-dma-channel",
240 "fsl,eloplus-dma-channel"; 240 "fsl,ssi-dma-channel";
241 cell-index = <0>; 241 cell-index = <0>;
242 reg = <0x0 0x80>; 242 reg = <0x0 0x80>;
243 interrupt-parent = <&mpic>; 243 interrupt-parent = <&mpic>;
@@ -245,7 +245,7 @@
245 }; 245 };
246 dma01: dma-channel@1 { 246 dma01: dma-channel@1 {
247 compatible = "fsl,mpc8610-dma-channel", 247 compatible = "fsl,mpc8610-dma-channel",
248 "fsl,eloplus-dma-channel"; 248 "fsl,ssi-dma-channel";
249 cell-index = <1>; 249 cell-index = <1>;
250 reg = <0x80 0x80>; 250 reg = <0x80 0x80>;
251 interrupt-parent = <&mpic>; 251 interrupt-parent = <&mpic>;