Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Timur Tabi and committed by
Kumar Gala
7de0c22b b56c2768

+2 -2
+2 -2
arch/powerpc/boot/dts/mpc8610_hpcd.dts
··· 237 237 238 238 dma00: dma-channel@0 { 239 239 compatible = "fsl,mpc8610-dma-channel", 240 - "fsl,eloplus-dma-channel"; 240 + "fsl,ssi-dma-channel"; 241 241 cell-index = <0>; 242 242 reg = <0x0 0x80>; 243 243 interrupt-parent = <&mpic>; ··· 245 245 }; 246 246 dma01: dma-channel@1 { 247 247 compatible = "fsl,mpc8610-dma-channel", 248 - "fsl,eloplus-dma-channel"; 248 + "fsl,ssi-dma-channel"; 249 249 cell-index = <1>; 250 250 reg = <0x80 0x80>; 251 251 interrupt-parent = <&mpic>;