diff mbox

ARM: dts: Modify SPI nodes according generic DMA DT bindings

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

Commit Message

Padmavathi Venna March 5, 2013, 10:04 a.m. UTC
This patch removes custom way of adding spi dma channels and
adds according to new generic DMA DT bindings on samsung exynos4
and exynos5440 platforms.

Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
---
 arch/arm/boot/dts/exynos4.dtsi    |   15 +++++++++------
 arch/arm/boot/dts/exynos5440.dtsi |    5 +++--
 2 files changed, 12 insertions(+), 8 deletions(-)

Comments

Sachin Kamat March 5, 2013, 10:06 a.m. UTC | #1
On 5 March 2013 15:34, Padmavathi Venna <padma.v@samsung.com> wrote:
> This patch removes custom way of adding spi dma channels and
> adds according to new generic DMA DT bindings on samsung exynos4
> and exynos5440 platforms.
>
> Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
> ---
>  arch/arm/boot/dts/exynos4.dtsi    |   15 +++++++++------
>  arch/arm/boot/dts/exynos5440.dtsi |    5 +++--
>  2 files changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
> index 1a62bcf..2449651 100644
> --- a/arch/arm/boot/dts/exynos4.dtsi
> +++ b/arch/arm/boot/dts/exynos4.dtsi
> @@ -235,8 +235,9 @@
>                 compatible = "samsung,exynos4210-spi";
>                 reg = <0x13920000 0x100>;
>                 interrupts = <0 66 0>;
> -               tx-dma-channel = <&pdma0 7>; /* preliminary */
> -               rx-dma-channel = <&pdma0 6>; /* preliminary */
> +               dmas = <&pdma0 7
> +                       &pdma0 6>;
> +               dma-names = "tx", "rx";
>                 #address-cells = <1>;
>                 #size-cells = <0>;
>                 status = "disabled";
> @@ -246,8 +247,9 @@
>                 compatible = "samsung,exynos4210-spi";
>                 reg = <0x13930000 0x100>;
>                 interrupts = <0 67 0>;
> -               tx-dma-channel = <&pdma1 7>; /* preliminary */
> -               rx-dma-channel = <&pdma1 6>; /* preliminary */
> +               dmas = <&pdma0 7
> +                       &pdma0 6>;

Shouldn't these be pdma1 as was earlier?
padma venkat March 5, 2013, 10:19 a.m. UTC | #2
On Tue, Mar 5, 2013 at 3:36 PM, Sachin Kamat <sachin.kamat@linaro.org> wrote:
> On 5 March 2013 15:34, Padmavathi Venna <padma.v@samsung.com> wrote:
>> This patch removes custom way of adding spi dma channels and
>> adds according to new generic DMA DT bindings on samsung exynos4
>> and exynos5440 platforms.
>>
>> Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
>> ---
>>  arch/arm/boot/dts/exynos4.dtsi    |   15 +++++++++------
>>  arch/arm/boot/dts/exynos5440.dtsi |    5 +++--
>>  2 files changed, 12 insertions(+), 8 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
>> index 1a62bcf..2449651 100644
>> --- a/arch/arm/boot/dts/exynos4.dtsi
>> +++ b/arch/arm/boot/dts/exynos4.dtsi
>> @@ -235,8 +235,9 @@
>>                 compatible = "samsung,exynos4210-spi";
>>                 reg = <0x13920000 0x100>;
>>                 interrupts = <0 66 0>;
>> -               tx-dma-channel = <&pdma0 7>; /* preliminary */
>> -               rx-dma-channel = <&pdma0 6>; /* preliminary */
>> +               dmas = <&pdma0 7
>> +                       &pdma0 6>;
>> +               dma-names = "tx", "rx";
>>                 #address-cells = <1>;
>>                 #size-cells = <0>;
>>                 status = "disabled";
>> @@ -246,8 +247,9 @@
>>                 compatible = "samsung,exynos4210-spi";
>>                 reg = <0x13930000 0x100>;
>>                 interrupts = <0 67 0>;
>> -               tx-dma-channel = <&pdma1 7>; /* preliminary */
>> -               rx-dma-channel = <&pdma1 6>; /* preliminary */
>> +               dmas = <&pdma0 7
>> +                       &pdma0 6>;
>
> Shouldn't these be pdma1 as was earlier?

Oops, It's my mistake. Will repost this.

Thanks
Padma
On 03/05/2013 11:06 AM, Sachin Kamat wrote:
> On 5 March 2013 15:34, Padmavathi Venna <padma.v@samsung.com> wrote:
>> This patch removes custom way of adding spi dma channels and
>> adds according to new generic DMA DT bindings on samsung exynos4
>> and exynos5440 platforms.
>>
>> Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
>> ---
>>  arch/arm/boot/dts/exynos4.dtsi    |   15 +++++++++------
>>  arch/arm/boot/dts/exynos5440.dtsi |    5 +++--
>>  2 files changed, 12 insertions(+), 8 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
...
>> @@ -246,8 +247,9 @@
>>                 compatible = "samsung,exynos4210-spi";
>>                 reg = <0x13930000 0x100>;
>>                 interrupts = <0 67 0>;
>> -               tx-dma-channel = <&pdma1 7>; /* preliminary */
>> -               rx-dma-channel = <&pdma1 6>; /* preliminary */
>> +               dmas = <&pdma0 7
>> +                       &pdma0 6>;
> 
> Shouldn't these be pdma1 as was earlier?

Yes, it should. And this is also what the SoC documentation says - SPI1 is
assigned to Peri DMA1.
diff mbox

Patch

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 1a62bcf..2449651 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -235,8 +235,9 @@ 
 		compatible = "samsung,exynos4210-spi";
 		reg = <0x13920000 0x100>;
 		interrupts = <0 66 0>;
-		tx-dma-channel = <&pdma0 7>; /* preliminary */
-		rx-dma-channel = <&pdma0 6>; /* preliminary */
+		dmas = <&pdma0 7
+			&pdma0 6>;
+		dma-names = "tx", "rx";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		status = "disabled";
@@ -246,8 +247,9 @@ 
 		compatible = "samsung,exynos4210-spi";
 		reg = <0x13930000 0x100>;
 		interrupts = <0 67 0>;
-		tx-dma-channel = <&pdma1 7>; /* preliminary */
-		rx-dma-channel = <&pdma1 6>; /* preliminary */
+		dmas = <&pdma0 7
+			&pdma0 6>;
+		dma-names = "tx", "rx";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		status = "disabled";
@@ -257,8 +259,9 @@ 
 		compatible = "samsung,exynos4210-spi";
 		reg = <0x13940000 0x100>;
 		interrupts = <0 68 0>;
-		tx-dma-channel = <&pdma0 9>; /* preliminary */
-		rx-dma-channel = <&pdma0 8>; /* preliminary */
+		dmas = <&pdma0 9
+			&pdma0 8>;
+		dma-names = "tx", "rx";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		status = "disabled";
diff --git a/arch/arm/boot/dts/exynos5440.dtsi b/arch/arm/boot/dts/exynos5440.dtsi
index 9a99755..31a3626 100644
--- a/arch/arm/boot/dts/exynos5440.dtsi
+++ b/arch/arm/boot/dts/exynos5440.dtsi
@@ -79,8 +79,9 @@ 
 		compatible = "samsung,exynos4210-spi";
 		reg = <0xD0000 0x1000>;
 		interrupts = <0 4 0>;
-		tx-dma-channel = <&pdma0 5>; /* preliminary */
-		rx-dma-channel = <&pdma0 4>; /* preliminary */
+		dmas = <&pdma0 5
+			&pdma0 4>;
+		dma-names = "tx", "rx";
 		#address-cells = <1>;
 		#size-cells = <0>;
 	};