ARM: dts: s5pv210: align DMA channels with dtschema

[ Upstream commit 9e916fb9bc3d16066286f19fc9c51d26a6aec6bd ]

dtschema expects DMA channels in specific order (tx, rx and tx-sec).
The order actually should not matter because dma-names is used however
let's make it aligned with dtschema to suppress warnings like:

  i2s@eee30000: dma-names: ['rx', 'tx', 'tx-sec'] is not valid under any of the given schemas

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Co-developed-by: Jonathan Bakker <xc-racer2@live.ca>
Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
Link: https://lore.kernel.org/r/CY4PR04MB056779A9C50DC95987C5272ACB1C9@CY4PR04MB0567.namprd04.prod.outlook.com
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm/boot/dts/s5pv210-aries.dtsi b/arch/arm/boot/dts/s5pv210-aries.dtsi
index 2f57100..9b7da2b 100644 (file)
--- a/arch/arm/boot/dts/s5pv210-aries.dtsi
+++ b/arch/arm/boot/dts/s5pv210-aries.dtsi
@@ -636,7 +636,7 @@
 };
 
 &i2s0 {
-       dmas = <&pdma0 9>, <&pdma0 10>, <&pdma0 11>;
+       dmas = <&pdma0 10>, <&pdma0 9>, <&pdma0 11>;
        status = "okay";
 };
 

diff --git a/arch/arm/boot/dts/s5pv210.dtsi b/arch/arm/boot/dts/s5pv210.dtsi
index 353ba7b..c5265f3 100644 (file)
--- a/arch/arm/boot/dts/s5pv210.dtsi
+++ b/arch/arm/boot/dts/s5pv210.dtsi
@@ -239,8 +239,8 @@
                        reg = <0xeee30000 0x1000>;
                        interrupt-parent = <&vic2>;
                        interrupts = <16>;
-                       dma-names = "rx", "tx", "tx-sec";
-                       dmas = <&pdma1 9>, <&pdma1 10>, <&pdma1 11>;
+                       dma-names = "tx", "rx", "tx-sec";
+                       dmas = <&pdma1 10>, <&pdma1 9>, <&pdma1 11>;
                        clock-names = "iis",
                                      "i2s_opclk0",
                                      "i2s_opclk1";
@@ -259,8 +259,8 @@
                        reg = <0xe2100000 0x1000>;
                        interrupt-parent = <&vic2>;
                        interrupts = <17>;
-                       dma-names = "rx", "tx";
-                       dmas = <&pdma1 12>, <&pdma1 13>;
+                       dma-names = "tx", "rx";
+                       dmas = <&pdma1 13>, <&pdma1 12>;
                        clock-names = "iis", "i2s_opclk0";
                        clocks = <&clocks CLK_I2S1>, <&clocks SCLK_AUDIO1>;
                        pinctrl-names = "default";
@@ -274,8 +274,8 @@
                        reg = <0xe2a00000 0x1000>;
                        interrupt-parent = <&vic2>;
                        interrupts = <18>;
-                       dma-names = "rx", "tx";
-                       dmas = <&pdma1 14>, <&pdma1 15>;
+                       dma-names = "tx", "rx";
+                       dmas = <&pdma1 15>, <&pdma1 14>;
                        clock-names = "iis", "i2s_opclk0";
                        clocks = <&clocks CLK_I2S2>, <&clocks SCLK_AUDIO2>;
                        pinctrl-names = "default";