diff mbox

[1/2] ARM: exynos: pl330: Add #dma-cells for generic dma binding support

Message ID 1362375268-29405-1-git-send-email-padma.v@samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

Padmavathi Venna March 4, 2013, 5:34 a.m. UTC
This patch adds #dma-cells property to PL330 DMA controller
nodes for supporting generic dma dt bindings on samsung exynos
platforms. #dma-channels and #dma-requests are not required now
but added in advance.

Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
---

Based on Torvalds tree

 arch/arm/boot/dts/exynos4.dtsi    |    9 +++++++++
 arch/arm/boot/dts/exynos5440.dtsi |    6 ++++++
 2 files changed, 15 insertions(+), 0 deletions(-)

Comments

Arnd Bergmann March 5, 2013, 10:37 p.m. UTC | #1
On Monday 04 March 2013, Padmavathi Venna wrote:
> 
> This patch adds #dma-cells property to PL330 DMA controller
> nodes for supporting generic dma dt bindings on samsung exynos
> platforms. #dma-channels and #dma-requests are not required now
> but added in advance.
> 
> Signed-off-by: Padmavathi Venna <padma.v@samsung.com>

Acked-by: Arnd Bergmann <arnd@arndb.de>

Should we apply these directly to the arm-soc fixes branch, or wait
until they come back from the Samsung subarchitecture tree?
padma venkat March 6, 2013, 5:13 a.m. UTC | #2
On Wed, Mar 6, 2013 at 4:07 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Monday 04 March 2013, Padmavathi Venna wrote:
>>
>> This patch adds #dma-cells property to PL330 DMA controller
>> nodes for supporting generic dma dt bindings on samsung exynos
>> platforms. #dma-channels and #dma-requests are not required now
>> but added in advance.
>>
>> Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
>
> Acked-by: Arnd Bergmann <arnd@arndb.de>
>
> Should we apply these directly to the arm-soc fixes branch, or wait
> until they come back from the Samsung subarchitecture tree?

Hmm, If Kukjin can take in 3.9 rc2 it's better to go via Samsung tree.

Kukjin,

Can you please take this patch in 3.9 rc2 ?

Thanks
Padma
Kim Kukjin March 7, 2013, 1:31 a.m. UTC | #3
Padma Venkat wrote:
> 
> On Wed, Mar 6, 2013 at 4:07 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> > On Monday 04 March 2013, Padmavathi Venna wrote:
> >>
> >> This patch adds #dma-cells property to PL330 DMA controller
> >> nodes for supporting generic dma dt bindings on samsung exynos
> >> platforms. #dma-channels and #dma-requests are not required now
> >> but added in advance.
> >>
> >> Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
> >
> > Acked-by: Arnd Bergmann <arnd@arndb.de>
> >
> > Should we apply these directly to the arm-soc fixes branch, or wait
> > until they come back from the Samsung subarchitecture tree?
> 
> Hmm, If Kukjin can take in 3.9 rc2 it's better to go via Samsung tree.
> 
> Kukjin,
> 
> Can you please take this patch in 3.9 rc2 ?
> 
Sure, I will.

BTW, Arnd, I'm not sure second one(socfpga.dtsi) can be handled in samsung
tree.

Thanks.

- Kukjin
Arnd Bergmann March 11, 2013, 9:02 p.m. UTC | #4
On Thursday 07 March 2013, Kukjin Kim wrote:
> > Can you please take this patch in 3.9 rc2 ?
> > 
> Sure, I will.
> 
> BTW, Arnd, I'm not sure second one(socfpga.dtsi) can be handled in samsung
> tree.

I guess you're right, I've applied the second one to the fixes branch now.

Thanks,

	Arnd
diff mbox

Patch

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index e1347fc..1a62bcf 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -275,18 +275,27 @@ 
 			compatible = "arm,pl330", "arm,primecell";
 			reg = <0x12680000 0x1000>;
 			interrupts = <0 35 0>;
+			#dma-cells = <1>;
+			#dma-channels = <8>;
+			#dma-requests = <32>;
 		};
 
 		pdma1: pdma@12690000 {
 			compatible = "arm,pl330", "arm,primecell";
 			reg = <0x12690000 0x1000>;
 			interrupts = <0 36 0>;
+			#dma-cells = <1>;
+			#dma-channels = <8>;
+			#dma-requests = <32>;
 		};
 
 		mdma1: mdma@12850000 {
 			compatible = "arm,pl330", "arm,primecell";
 			reg = <0x12850000 0x1000>;
 			interrupts = <0 34 0>;
+			#dma-cells = <1>;
+			#dma-channels = <8>;
+			#dma-requests = <1>;
 		};
 	};
 };
diff --git a/arch/arm/boot/dts/exynos5440.dtsi b/arch/arm/boot/dts/exynos5440.dtsi
index 5f3562a..9a99755 100644
--- a/arch/arm/boot/dts/exynos5440.dtsi
+++ b/arch/arm/boot/dts/exynos5440.dtsi
@@ -142,12 +142,18 @@ 
 			compatible = "arm,pl330", "arm,primecell";
 			reg = <0x120000 0x1000>;
 			interrupts = <0 34 0>;
+			#dma-cells = <1>;
+			#dma-channels = <8>;
+			#dma-requests = <32>;
 		};
 
 		pdma1: pdma@121B0000 {
 			compatible = "arm,pl330", "arm,primecell";
 			reg = <0x121000 0x1000>;
 			interrupts = <0 35 0>;
+			#dma-cells = <1>;
+			#dma-channels = <8>;
+			#dma-requests = <32>;
 		};
 	};