Skip to contentSkip to conversation

DT updates for dma-names ordering checks

PATCH Applied Kuldeep Singh 4 participants 9 messages Mar 26, 2022 – Apr 10, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover DT updates for dma-names ordering checks

This patchset attempts to fix DTs possessing dma ordering issues. The motivation of the series is taken from a discussion done before.

Just a quick summary for new visitors.
There are few DTs which require dma ordering in order to resolve below 'make dtbs_check' issues and this patchset is in direction to fix that. dma-names:0: 'rx' was expected
dma-names:0: 'tx' was expected

Kuldeep Singh (4):
ARM: dts: spear13xx: Update SPI dma properties
ARM: dts: spear1340: Update serial node properties
arm64: dts: ls1043a: Update i2c dma properties
arm64: dts: ls1046a: Update i2c node dma properties

 arch/arm/boot/dts/spear1340.dtsi               | 6 +++---
 arch/arm/boot/dts/spear13xx.dtsi               | 6 +++---
 arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 6 +++---
 arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/4 ARM: dts: spear13xx: Update SPI dma properties

Reorder dmas and dma-names property for spi controller node to make it compliant with bindings.

Fixes 6e8887f60f60 ("ARM: SPEAr13xx: Pass generic DW DMAC platform data from DT")
---
 arch/arm/boot/dts/spear13xx.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/spear13xx.dtsi +3 -3
index c87b881b2c8b..913553367687 100644
@@ -284,9 +284,9 @@ spi0: spi@e0100000 {
 				#size-cells = <0>;
 				interrupts = <0 31 0x4>;
 				status = "disabled";
-				dmas = <&dwdma0 4 0 0>,
-					<&dwdma0 5 0 0>;
-				dma-names = "tx", "rx";
+				dmas = <&dwdma0 5 0 0>,
+					<&dwdma0 4 0 0>;
+				dma-names = "rx", "tx";
 			};
 
 			rtc@e0580000 {
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/4 ARM: dts: spear1340: Update serial node properties

In reply to Kuldeep Singh

Reorder dma and dma-names property for serial node to make it compliant with bindings.

Fixes 6e8887f60f60 ("ARM: SPEAr13xx: Pass generic DW DMAC platform data from DT")
---
 arch/arm/boot/dts/spear1340.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/spear1340.dtsi +3 -3
index 827e887afbda..13e1bdb3ddbf 100644
@@ -134,9 +134,9 @@ serial@b4100000 {
 				reg = <0xb4100000 0x1000>;
 				interrupts = <0 105 0x4>;
 				status = "disabled";
-				dmas = <&dwdma0 12 0 1>,
-					<&dwdma0 13 1 0>;
-				dma-names = "tx", "rx";
+				dmas = <&dwdma0 13 0 1>,
+					<&dwdma0 12 1 0>;
+				dma-names = "rx", "tx";
 			};
 
 			thermal@e07008c4 {
Signature · 1 line
2.25.1
Acked-by on v1 2/4
#3 lore raw

Re: [PATCH 2/4] ARM: dts: spear1340: Update serial node properties

Quoted 16 lines · Kuldeep Singh

Reorder dma and dma-names property for serial node to make it compliant with bindings.

Fixes 6e8887f60f60 ("ARM: SPEAr13xx: Pass generic DW DMAC platform data from DT")
---
 arch/arm/boot/dts/spear1340.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/spear1340.dtsi +0 -0
index 827e887afbda..13e1bdb3ddbf 100644
@@ -134,9 +134,9 @@ serial@b4100000 {
 				reg = <0xb4100000 0x1000>;
 				interrupts = <0 105 0x4>;

arch/arm/boot/dts/spear1340.dtsi serial@b4100000 { · line 142

Quoted 10 lines
arch/arm/boot/dts/spear1340.dtsi +3 -3
 				status = "disabled";
-				dmas = <&dwdma0 12 0 1>,
-					<&dwdma0 13 1 0>;
-				dma-names = "tx", "rx";
+				dmas = <&dwdma0 13 0 1>,
+					<&dwdma0 12 1 0>;
+				dma-names = "rx", "tx";
 			};
 
 			thermal@e07008c4 {
Signature · 1 line
viresh
#4 lore raw

PATCH 3/4 arm64: dts: ls1043a: Update i2c dma properties

In reply to Kuldeep Singh

Reorder dmas and dma-names properties for i2c controller node to make it compliant with bindings.

Fixes 6d453cd22357 ("arm64: dts: add Freescale LS1043a SoC support")
---
 arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi +3 -3
index 01b01e320411..35d1939e690b 100644
@@ -536,9 +536,9 @@ i2c0: i2c@2180000 {
 			clock-names = "i2c";
 			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
 					    QORIQ_CLK_PLL_DIV(1)>;
-			dmas = <&edma0 1 39>,
-			       <&edma0 1 38>;
-			dma-names = "tx", "rx";
+			dmas = <&edma0 1 38>,
+			       <&edma0 1 39>;
+			dma-names = "rx", "tx";
 			status = "disabled";
 		};
 
Signature · 1 line
2.25.1
#5 lore raw

Re: [PATCH 3/4] arm64: dts: ls1043a: Update i2c dma properties

Quoted 6 lines · Kuldeep Singh

Reorder dmas and dma-names properties for i2c controller node to make it compliant with bindings.

Fixes 6d453cd22357 ("arm64: dts: add Freescale LS1043a SoC support")

Applied 3/4 and 4/4, thanks!

#6 lore raw

Re: [PATCH 3/4] arm64: dts: ls1043a: Update i2c dma properties

Quoted 10 lines · Shawn Guo
Quoted 6 lines · Kuldeep Singh

Reorder dmas and dma-names properties for i2c controller node to make it compliant with bindings.

Fixes 6d453cd22357 ("arm64: dts: add Freescale LS1043a SoC support")

Applied 3/4 and 4/4, thanks!

Ignore it. They have landed into v5.18-rc1.

#7 lore raw

PATCH 4/4 arm64: dts: ls1046a: Update i2c node dma properties

In reply to Kuldeep Singh

Reorder dmas and dma-names properties for i2c controller node to make it compliant with bindings.

Fixes 8126d88162a5 ("arm64: dts: add QorIQ LS1046A SoC support")
---
 arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi +3 -3
index 687fea6d8afa..4e7bd04d9798 100644
@@ -499,9 +499,9 @@ i2c0: i2c@2180000 {
 			interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
 					    QORIQ_CLK_PLL_DIV(2)>;
-			dmas = <&edma0 1 39>,
-			       <&edma0 1 38>;
-			dma-names = "tx", "rx";
+			dmas = <&edma0 1 38>,
+			       <&edma0 1 39>;
+			dma-names = "rx", "tx";
 			status = "disabled";
 		};
 
Signature · 1 line
2.25.1
#8 lore raw
In reply to Kuldeep Singh
This series was applied to soc/soc.git (arm/fixes) by Arnd Bergmann <[email protected]>:

Hello:

This series was applied to soc/soc.git (arm/fixes) by Arnd Bergmann <[email protected]>:

Quoted 11 lines · On Sat, 26 Mar 2022 09:53:08 +0530 you wrote:

This patchset attempts to fix DTs possessing dma ordering issues. The motivation of the series is taken from a discussion done before.

Just a quick summary for new visitors.
There are few DTs which require dma ordering in order to resolve below 'make dtbs_check' issues and this patchset is in direction to fix that. dma-names:0: 'rx' was expected
dma-names:0: 'tx' was expected

[...]

Here is the summary with links:
- [1/4] ARM: dts: spear13xx: Update SPI dma properties

    https://git.kernel.org/soc/soc/c/31d3687d6017
  - [2/4] ARM: dts: spear1340: Update serial node properties
    https://git.kernel.org/soc/soc/c/583d6b006264
  - [3/4] arm64: dts: ls1043a: Update i2c dma properties
    https://git.kernel.org/soc/soc/c/aa4df840d1c5
  - [4/4] arm64: dts: ls1046a: Update i2c node dma properties
    https://git.kernel.org/soc/soc/c/eeeb4f1075d7

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html