summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTimur Tabi <timur@freescale.com>2010-12-03 10:52:14 -0600
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-17 14:47:20 -0800
commit1caf470a3c4ab570b38a6e7c339e06f18909ef98 (patch)
tree3fc68707d74cd3486190ad49120f0bf0680df571 /arch
parente4bbb71290c897c349f9bed3a92907be95e16656 (diff)
powerpc/85xx: fix compatible properties of the P1022DS DMA nodes used for audio
commit b2e0861e51f2961954330dcafe6d148ee3ab5cff upstream. In order to prevent the fsl_dma driver from claiming the DMA channels that the P1022DS audio driver needs, the compatible properties for those nodes must say "fsl,ssi-dma-channel" instead of "fsl,eloplus-dma-channel". Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/boot/dts/p1022ds.dts4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/p1022ds.dts b/arch/powerpc/boot/dts/p1022ds.dts
index 8bcb10b92677..d086e0f8bbd3 100644
--- a/arch/powerpc/boot/dts/p1022ds.dts
+++ b/arch/powerpc/boot/dts/p1022ds.dts
@@ -280,13 +280,13 @@
ranges = <0x0 0xc100 0x200>;
cell-index = <1>;
dma00: dma-channel@0 {
- compatible = "fsl,eloplus-dma-channel";
+ compatible = "fsl,ssi-dma-channel";
reg = <0x0 0x80>;
cell-index = <0>;
interrupts = <76 2>;
};
dma01: dma-channel@80 {
- compatible = "fsl,eloplus-dma-channel";
+ compatible = "fsl,ssi-dma-channel";
reg = <0x80 0x80>;
cell-index = <1>;
interrupts = <77 2>;