linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] powerpc/85xx: fix compatible properties of the P1022DS DMA nodes used for audio
@ 2010-12-03 16:52 Timur Tabi
  2011-01-13  0:08 ` Kumar Gala
  0 siblings, 1 reply; 3+ messages in thread
From: Timur Tabi @ 2010-12-03 16:52 UTC (permalink / raw)
  To: kumar.gala, linuxppc-dev, alsa-devel

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(-)

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>;
-- 
1.7.2.3

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] powerpc/85xx: fix compatible properties of the P1022DS DMA nodes used for audio
  2010-12-03 16:52 [PATCH] powerpc/85xx: fix compatible properties of the P1022DS DMA nodes used for audio Timur Tabi
@ 2011-01-13  0:08 ` Kumar Gala
  0 siblings, 0 replies; 3+ messages in thread
From: Kumar Gala @ 2011-01-13  0:08 UTC (permalink / raw)
  To: Timur Tabi; +Cc: linuxppc-dev, alsa-devel


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".
>=20
> Signed-off-by: Timur Tabi <timur@freescale.com>
> ---
>=20
> Kumar, please pick up this patch for 2.6.37.
>=20
> arch/powerpc/boot/dts/p1022ds.dts |    4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)

applied to next

- k=

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH] powerpc/85xx: fix compatible properties of the P1022DS DMA nodes used for audio
@ 2011-02-03 17:39 Timur Tabi
  0 siblings, 0 replies; 3+ messages in thread
From: Timur Tabi @ 2011-02-03 17:39 UTC (permalink / raw)
  To: stable, linux-kernel, linuxppc-dev

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".

Commit b2e0861e51f2961954330dcafe6d148ee3ab5cff upstream.

Signed-off-by: Timur Tabi <timur@freescale.com>
Cc: stable@kernel.org
---
 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 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>;
-- 
1.7.3.4

^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-02-03 17:39 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-03 16:52 [PATCH] powerpc/85xx: fix compatible properties of the P1022DS DMA nodes used for audio Timur Tabi
2011-01-13  0:08 ` Kumar Gala
  -- strict thread matches above, loose matches on Subject: below --
2011-02-03 17:39 Timur Tabi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).