| Message ID | 1291395134-12435-1-git-send-email-timur@freescale.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | b2e0861e51f2961954330dcafe6d148ee3ab5cff |
| Delegated to: | Kumar Gala |
| Headers | show |
On Dec 3, 2010, at 10:52 AM, Timur Tabi wrote: > 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> > --- > > Kumar, please pick up this patch for 2.6.37. > > arch/powerpc/boot/dts/p1022ds.dts | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) applied to next - k
diff --git a/arch/powerpc/boot/dts/p1022ds.dts b/arch/powerpc/boot/dts/p1022ds.dts index 2bbecbb..69422eb 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>;
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> --- Kumar, please pick up this patch for 2.6.37. arch/powerpc/boot/dts/p1022ds.dts | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)