| Submitter | Timur Tabi |
|---|---|
| Date | Oct. 10, 2008, 4:52 p.m. |
| Message ID | <1223657552-15008-2-git-send-email-timur@freescale.com> |
| Download | mbox | patch |
| Permalink | /patch/3829/ |
| State | Accepted |
| Commit | 7de0c22bba1f6117c3447af2cdca9904303012da |
| Delegated to: | Kumar Gala |
| Headers | show |
Comments
On Oct 10, 2008, at 11:52 AM, Timur Tabi wrote: > 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> > --- > arch/powerpc/boot/dts/mpc8610_hpcd.dts | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) applied - k
Patch
diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts index 0f3a36e..3f4c610 100644 --- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts +++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts @@ -237,7 +237,7 @@ dma00: dma-channel@0 { compatible = "fsl,mpc8610-dma-channel", - "fsl,eloplus-dma-channel"; + "fsl,ssi-dma-channel"; cell-index = <0>; reg = <0x0 0x80>; interrupt-parent = <&mpic>; @@ -245,7 +245,7 @@ }; dma01: dma-channel@1 { compatible = "fsl,mpc8610-dma-channel", - "fsl,eloplus-dma-channel"; + "fsl,ssi-dma-channel"; cell-index = <1>; reg = <0x80 0x80>; interrupt-parent = <&mpic>;
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> --- arch/powerpc/boot/dts/mpc8610_hpcd.dts | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)