소스 검색

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>
Timur Tabi 16 년 전
부모
커밋
7de0c22bba
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      arch/powerpc/boot/dts/mpc8610_hpcd.dts

+ 2 - 2
arch/powerpc/boot/dts/mpc8610_hpcd.dts

@@ -237,7 +237,7 @@
 
 
 			dma00: dma-channel@0 {
 			dma00: dma-channel@0 {
 				compatible = "fsl,mpc8610-dma-channel",
 				compatible = "fsl,mpc8610-dma-channel",
-					"fsl,eloplus-dma-channel";
+					"fsl,ssi-dma-channel";
 				cell-index = <0>;
 				cell-index = <0>;
 				reg = <0x0 0x80>;
 				reg = <0x0 0x80>;
 				interrupt-parent = <&mpic>;
 				interrupt-parent = <&mpic>;
@@ -245,7 +245,7 @@
 			};
 			};
 			dma01: dma-channel@1 {
 			dma01: dma-channel@1 {
 				compatible = "fsl,mpc8610-dma-channel",
 				compatible = "fsl,mpc8610-dma-channel",
-					"fsl,eloplus-dma-channel";
+					"fsl,ssi-dma-channel";
 				cell-index = <1>;
 				cell-index = <1>;
 				reg = <0x80 0x80>;
 				reg = <0x80 0x80>;
 				interrupt-parent = <&mpic>;
 				interrupt-parent = <&mpic>;