diff mbox series

[4.4.y-cip,1/2] ARM: DTS: am33xx: Use the new DT bindings for the eDMA3

Message ID HK2PR01MB32816B8BCBF222E046FE5524FA860@HK2PR01MB3281.apcprd01.prod.exchangelabs.com (mailing list archive)
State Accepted
Headers show
Series Add dts for Moxa UC-8100-ME-T platform | expand

Commit Message

Johnson CH Chen (陳昭勳) June 5, 2020, 9:35 a.m. UTC 
From: Peter Ujfalusi <peter.ujfalusi@ti.com>

commit b5e5090660742c838ddc0b5d1a001e6fe3d5bfd5 upstream.

Switch to use the ti,edma3-tpcc and ti,edma3-tptc binding for the eDMA3 and
enable the DMA even crossbar with ti,am335x-edma-crossbar.
With the new bindings boards can customize and tweak the DMA channel
priority to match their needs. With the new binding the memcpy is safe
to be used since with the old binding it was not possible for a driver
to know which channel is allowed to be used as non HW triggered channel.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Johnson Chen <johnsonch.chen@moxa.com>
---
 arch/arm/boot/dts/am335x-evm.dts    |  9 +---
 arch/arm/boot/dts/am335x-pepper.dts | 11 +----
 arch/arm/boot/dts/am33xx.dtsi       | 94 ++++++++++++++++++++++++++-----------
 3 files changed, 71 insertions(+), 43 deletions(-)

Comments

Pavel Machek June 5, 2020, 9:18 p.m. UTC | #1 
Hi!

> From: Peter Ujfalusi <peter.ujfalusi@ti.com>
> 
> commit b5e5090660742c838ddc0b5d1a001e6fe3d5bfd5 upstream.

I get quite a lot of complains here, if I try to apply patch
automatically using git-am.

Applying: ARM: DTS: am33xx: Use the new DT bindings for the eDMA3
.git/rebase-apply/patch:17: trailing whitespace.
	dmas = <&edma_xbar 12 0 1
.git/rebase-apply/patch:18: trailing whitespace.
		&edma_xbar 13 0 2>;
.git/rebase-apply/patch:58: trailing whitespace.
	dmas = <&edma_xbar 12 0 1
.git/rebase-apply/patch:59: trailing whitespace.
		&edma_xbar 13 0 2>;
.git/rebase-apply/patch:71: trailing whitespace.
				edma_xbar: dma-router@f90 {
error: patch failed: arch/arm/boot/dts/am335x-evm.dts:743
error: arch/arm/boot/dts/am335x-evm.dts: patch does not apply
error: patch failed: arch/arm/boot/dts/am335x-pepper.dts:339
error: arch/arm/boot/dts/am335x-pepper.dts: patch does not apply
error: patch failed: arch/arm/boot/dts/am33xx.dtsi:162
error: arch/arm/boot/dts/am33xx.dtsi: patch does not apply
Patch failed at 0001 ARM: DTS: am33xx: Use the new DT bindings for the eDMA3
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".

And it seems to me problem is in CR/LF line endings in the patch:

pavel@amd:~/cip/k$ file .git/rebase-apply/patch
.git/rebase-apply/patch: unified diff output, ASCII text, with CRLF
line terminators

I believe I could somehow convince git to apply it, anyway; or maybe
to cherry-pick commits from mainline, but... Could I ask for a patch
series that can be applied using git am?

Thanks and best regards,
								Pavel
Johnson CH Chen (陳昭勳) June 6, 2020, 11:49 a.m. UTC | #2 
Hello,

> Hi!
>
> > From: Peter Ujfalusi <peter.ujfalusi@ti.com>
> >
> > commit b5e5090660742c838ddc0b5d1a001e6fe3d5bfd5 upstream.
>
> I get quite a lot of complains here, if I try to apply patch automatically using git-am.
>
> Applying: ARM: DTS: am33xx: Use the new DT bindings for the eDMA3
> .git/rebase-apply/patch:17: trailing whitespace.
>         dmas = <&edma_xbar 12 0 1
> .git/rebase-apply/patch:18: trailing whitespace.
>                 &edma_xbar 13 0 2>;
> .git/rebase-apply/patch:58: trailing whitespace.
>         dmas = <&edma_xbar 12 0 1
> .git/rebase-apply/patch:59: trailing whitespace.
>                 &edma_xbar 13 0 2>;
> .git/rebase-apply/patch:71: trailing whitespace.
>                                 edma_xbar: dma-router@f90 {
> error: patch failed: arch/arm/boot/dts/am335x-evm.dts:743
> error: arch/arm/boot/dts/am335x-evm.dts: patch does not apply
> error: patch failed: arch/arm/boot/dts/am335x-pepper.dts:339
> error: arch/arm/boot/dts/am335x-pepper.dts: patch does not apply
> error: patch failed: arch/arm/boot/dts/am33xx.dtsi:162
> error: arch/arm/boot/dts/am33xx.dtsi: patch does not apply Patch 
> failed at 0001 ARM: DTS: am33xx: Use the new DT bindings for the
> eDMA3
> The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue".
>
> And it seems to me problem is in CR/LF line endings in the patch:
>
> pavel@amd:~/cip/k$ file .git/rebase-apply/patch
> .git/rebase-apply/patch: unified diff output, ASCII text, with CRLF 
> line terminators
>
> I believe I could somehow convince git to apply it, anyway; or maybe to cherry-pick commits from mainline, but... Could I ask for a patch series that can be applied using git am?
>

Thanks your respone!

I am sorry about this problem. I find the same failed situations with my local part. This problem is similar to commit patch again, but I can copy this problem with editor's operation with Windows.

I apologize for your inconvenience, could I re-send correct patch series again? So many thanks!

> Thanks and best regards,
>                                                                 Pavel
> --
> DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
>

Best regards,
Johnson
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#4728): https://lists.cip-project.org/g/cip-dev/message/4728
Mute This Topic: https://lists.cip-project.org/mt/74689397/4520428
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129116/1171672734/xyzzy  [patchwork-cip-dev@patchwork.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
SZ Lin June 6, 2020, 1:48 p.m. UTC | #3 
Hi Johnson,

johnsonch.chen@moxa.com <JohnsonCH.Chen@moxa.com> 於 2020年6月6日 週六 下午7:49寫道：

<snip>

> Thanks your respone!
>
> I am sorry about this problem. I find the same failed situations with my local part. This problem is similar to commit patch again, but I can copy this problem with editor's operation with Windows.

Please avoid using the editor in the Windows environment. AFAIK, some
editors in Windows OS add CRLF character to the line endings automatically.

SZ

>
> I apologize for your inconvenience, could I re-send correct patch series again? So many thanks!
>
> > Thanks and best regards,
> >                                                                 Pavel
> > --
> > DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> >
>
> Best regards,
> Johnson
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#4729): https://lists.cip-project.org/g/cip-dev/message/4729
Mute This Topic: https://lists.cip-project.org/mt/74689397/4520428
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129116/1171672734/xyzzy  [patchwork-cip-dev@patchwork.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
Nobuhiro Iwamatsu June 7, 2020, 11:35 p.m. UTC | #4 
Hi,

> -----Original Message-----
> From: Pavel Machek [mailto:pavel@denx.de]
> Sent: Saturday, June 6, 2020 6:18 AM
> To: Johnson CH Chen (陳昭勳) <JohnsonCH.Chen@moxa.com>
> Cc: iwamatsu nobuhiro(岩松 信洋 □ＳＷＣ◯ＡＣＴ) <nobuhiro1.iwamatsu@toshiba.co.jp>; pavel@denx.de;
> cip-dev@lists.cip-project.org
> Subject: Re: [cip-dev][PATCH 4.4.y-cip 1/2] ARM: DTS: am33xx: Use the new DT bindings for the eDMA3
> 
> Hi!
> 
> > From: Peter Ujfalusi <peter.ujfalusi@ti.com>
> >
> > commit b5e5090660742c838ddc0b5d1a001e6fe3d5bfd5 upstream.
> 
> I get quite a lot of complains here, if I try to apply patch
> automatically using git-am.
> 
> Applying: ARM: DTS: am33xx: Use the new DT bindings for the eDMA3
> .git/rebase-apply/patch:17: trailing whitespace.
> 	dmas = <&edma_xbar 12 0 1
> .git/rebase-apply/patch:18: trailing whitespace.
> 		&edma_xbar 13 0 2>;
> .git/rebase-apply/patch:58: trailing whitespace.
> 	dmas = <&edma_xbar 12 0 1
> .git/rebase-apply/patch:59: trailing whitespace.
> 		&edma_xbar 13 0 2>;
> .git/rebase-apply/patch:71: trailing whitespace.
> 				edma_xbar: dma-router@f90 {
> error: patch failed: arch/arm/boot/dts/am335x-evm.dts:743
> error: arch/arm/boot/dts/am335x-evm.dts: patch does not apply
> error: patch failed: arch/arm/boot/dts/am335x-pepper.dts:339
> error: arch/arm/boot/dts/am335x-pepper.dts: patch does not apply
> error: patch failed: arch/arm/boot/dts/am33xx.dtsi:162
> error: arch/arm/boot/dts/am33xx.dtsi: patch does not apply
> Patch failed at 0001 ARM: DTS: am33xx: Use the new DT bindings for the eDMA3
> The copy of the patch that failed is found in: .git/rebase-apply/patch
> When you have resolved this problem, run "git am --continue".
> 
> And it seems to me problem is in CR/LF line endings in the patch:
> 
> pavel@amd:~/cip/k$ file .git/rebase-apply/patch
> .git/rebase-apply/patch: unified diff output, ASCII text, with CRLF
> line terminators
> 
> I believe I could somehow convince git to apply it, anyway; or maybe
> to cherry-pick commits from mainline, but... Could I ask for a patch
> series that can be applied using git am?

I got patches from patchwork, I could apply.
The line ending code of the patch obtained from patchwork was LF.
So, I applied and push these patches.	

Best regards,
  Nobuhiro
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#4731): https://lists.cip-project.org/g/cip-dev/message/4731
Mute This Topic: https://lists.cip-project.org/mt/74689397/4520428
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129116/1171672734/xyzzy  [patchwork-cip-dev@patchwork.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index 2b8614e406f0..656d4304ab6b 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -743,8 +743,8 @@ 
 &mmc3 {
 	/* these are on the crossbar and are outlined in the
 	   xbar-event-map element */
-	dmas = <&edma 12
-		&edma 13>;
+	dmas = <&edma_xbar 12 0 1
+		&edma_xbar 13 0 2>;
 	dma-names = "tx", "rx";
 	status = "okay";
 	vmmc-supply = <&wlan_en_reg>;
@@ -766,11 +766,6 @@ 
 	};
 };
 
-&edma {
-	ti,edma-xbar-event-map = /bits/ 16 <1 12
-					    2 13>;
-};
-
 &sham {
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/am335x-pepper.dts b/arch/arm/boot/dts/am335x-pepper.dts
index 7106114c7464..39073b921664 100644
--- a/arch/arm/boot/dts/am335x-pepper.dts
+++ b/arch/arm/boot/dts/am335x-pepper.dts
@@ -339,13 +339,6 @@ 
 	ti,non-removable;
 };
 
-&edma {
-	/* Map eDMA MMC2 Events from Crossbar */
-	ti,edma-xbar-event-map = /bits/ 16 <1 12
-                                            2 13>;
-};
-
-
 &mmc3 {
 	/* Wifi & Bluetooth on MMC #3 */
 	status = "okay";
@@ -354,8 +347,8 @@ 
 	vmmmc-supply = <&v3v3c_reg>;
 	bus-width = <4>;
 	ti,non-removable;
-	dmas = <&edma 12
-		&edma 13>;
+	dmas = <&edma_xbar 12 0 1
+		&edma_xbar 13 0 2>;
 	dma-names = "tx", "rx";
 };
 
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index be9c37e89be1..4b40e6d401a0 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -162,6 +162,14 @@ 
 					mboxes = <&mailbox &mbox_wkupm3>;
 				};
 
+				edma_xbar: dma-router@f90 {
+					compatible = "ti,am335x-edma-crossbar";
+					reg = <0xf90 0x40>;
+					#dma-cells = <3>;
+					dma-requests = <32>;
+					dma-masters = <&edma>;
+				};
+
 				scm_clockdomains: clockdomains {
 				};
 			};
@@ -175,12 +183,44 @@ 
 		};
 
 		edma: edma@49000000 {
-			compatible = "ti,edma3";
-			ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2";
-			reg =	<0x49000000 0x10000>,
-				<0x44e10f90 0x40>;
+			compatible = "ti,edma3-tpcc";
+			ti,hwmods = "tpcc";
+			reg =	<0x49000000 0x10000>;
+			reg-names = "edma3_cc";
 			interrupts = <12 13 14>;
-			#dma-cells = <1>;
+			interrupt-names = "edma3_ccint", "emda3_mperr",
+					  "edma3_ccerrint";
+			dma-requests = <64>;
+			#dma-cells = <2>;
+
+			ti,tptcs = <&edma_tptc0 7>, <&edma_tptc1 5>,
+				   <&edma_tptc2 0>;
+
+			ti,edma-memcpy-channels = <20 21>;
+		};
+
+		edma_tptc0: tptc@49800000 {
+			compatible = "ti,edma3-tptc";
+			ti,hwmods = "tptc0";
+			reg =	<0x49800000 0x100000>;
+			interrupts = <112>;
+			interrupt-names = "edma3_tcerrint";
+		};
+
+		edma_tptc1: tptc@49900000 {
+			compatible = "ti,edma3-tptc";
+			ti,hwmods = "tptc1";
+			reg =	<0x49900000 0x100000>;
+			interrupts = <113>;
+			interrupt-names = "edma3_tcerrint";
+		};
+
+		edma_tptc2: tptc@49a00000 {
+			compatible = "ti,edma3-tptc";
+			ti,hwmods = "tptc2";
+			reg =	<0x49a00000 0x100000>;
+			interrupts = <114>;
+			interrupt-names = "edma3_tcerrint";
 		};
 
 		gpio0: gpio@44e07000 {
@@ -234,7 +274,7 @@ 
 			reg = <0x44e09000 0x2000>;
 			interrupts = <72>;
 			status = "disabled";
-			dmas = <&edma 26>, <&edma 27>;
+			dmas = <&edma 26 0>, <&edma 27 0>;
 			dma-names = "tx", "rx";
 		};
 
@@ -245,7 +285,7 @@ 
 			reg = <0x48022000 0x2000>;
 			interrupts = <73>;
 			status = "disabled";
-			dmas = <&edma 28>, <&edma 29>;
+			dmas = <&edma 28 0>, <&edma 29 0>;
 			dma-names = "tx", "rx";
 		};
 
@@ -256,7 +296,7 @@ 
 			reg = <0x48024000 0x2000>;
 			interrupts = <74>;
 			status = "disabled";
-			dmas = <&edma 30>, <&edma 31>;
+			dmas = <&edma 30 0>, <&edma 31 0>;
 			dma-names = "tx", "rx";
 		};
 
@@ -323,8 +363,8 @@ 
 			ti,dual-volt;
 			ti,needs-special-reset;
 			ti,needs-special-hs-handling;
-			dmas = <&edma 24
-				&edma 25>;
+			dmas = <&edma_xbar 24 0 0
+				&edma_xbar 25 0 0>;
 			dma-names = "tx", "rx";
 			interrupts = <64>;
 			interrupt-parent = <&intc>;
@@ -336,8 +376,8 @@ 
 			compatible = "ti,omap4-hsmmc";
 			ti,hwmods = "mmc2";
 			ti,needs-special-reset;
-			dmas = <&edma 2
-				&edma 3>;
+			dmas = <&edma 2 0
+				&edma 3 0>;
 			dma-names = "tx", "rx";
 			interrupts = <28>;
 			interrupt-parent = <&intc>;
@@ -475,10 +515,10 @@ 
 			interrupts = <65>;
 			ti,spi-num-cs = <2>;
 			ti,hwmods = "spi0";
-			dmas = <&edma 16
-				&edma 17
-				&edma 18
-				&edma 19>;
+			dmas = <&edma 16 0
+				&edma 17 0
+				&edma 18 0
+				&edma 19 0>;
 			dma-names = "tx0", "rx0", "tx1", "rx1";
 			status = "disabled";
 		};
@@ -491,10 +531,10 @@ 
 			interrupts = <125>;
 			ti,spi-num-cs = <2>;
 			ti,hwmods = "spi1";
-			dmas = <&edma 42
-				&edma 43
-				&edma 44
-				&edma 45>;
+			dmas = <&edma 42 0
+				&edma 43 0
+				&edma 44 0
+				&edma 45 0>;
 			dma-names = "tx0", "rx0", "tx1", "rx1";
 			status = "disabled";
 		};
@@ -832,7 +872,7 @@ 
 			ti,hwmods = "sham";
 			reg = <0x53100000 0x200>;
 			interrupts = <109>;
-			dmas = <&edma 36>;
+			dmas = <&edma 36 0>;
 			dma-names = "rx";
 		};
 
@@ -841,8 +881,8 @@ 
 			ti,hwmods = "aes";
 			reg = <0x53500000 0xa0>;
 			interrupts = <103>;
-			dmas = <&edma 6>,
-			       <&edma 5>;
+			dmas = <&edma 6 0>,
+			       <&edma 5 0>;
 			dma-names = "tx", "rx";
 		};
 
@@ -855,8 +895,8 @@ 
 			interrupts = <80>, <81>;
 			interrupt-names = "tx", "rx";
 			status = "disabled";
-			dmas = <&edma 8>,
-				<&edma 9>;
+			dmas = <&edma 8 2>,
+				<&edma 9 2>;
 			dma-names = "tx", "rx";
 		};
 
@@ -869,8 +909,8 @@ 
 			interrupts = <82>, <83>;
 			interrupt-names = "tx", "rx";
 			status = "disabled";
-			dmas = <&edma 10>,
-				<&edma 11>;
+			dmas = <&edma 10 2>,
+				<&edma 11 2>;
 			dma-names = "tx", "rx";
 		};