diff options
| author | Timur Tabi <timur@freescale.com> | 2010-12-03 10:52:14 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2011-01-12 18:01:09 -0600 |
| commit | b2e0861e51f2961954330dcafe6d148ee3ab5cff (patch) | |
| tree | 1f8bfdd2b8ec2100b80cec03408690a49606ac4b /arch/powerpc/boot | |
| parent | fd066e850351e21d1b385cde35fadf66761bc053 (diff) | |
| download | kernel_samsung_smdk4412-b2e0861e51f2961954330dcafe6d148ee3ab5cff.tar.gz kernel_samsung_smdk4412-b2e0861e51f2961954330dcafe6d148ee3ab5cff.tar.bz2 kernel_samsung_smdk4412-b2e0861e51f2961954330dcafe6d148ee3ab5cff.zip | |
powerpc/85xx: fix compatible properties of the P1022DS DMA nodes used for audio
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>
Diffstat (limited to 'arch/powerpc/boot')
| -rw-r--r-- | arch/powerpc/boot/dts/p1022ds.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/p1022ds.dts b/arch/powerpc/boot/dts/p1022ds.dts index 2bbecbb4cbf..69422eb24d9 100644 --- a/arch/powerpc/boot/dts/p1022ds.dts +++ b/arch/powerpc/boot/dts/p1022ds.dts @@ -291,13 +291,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>; |