ARM: dts: rockchip: swap clocks and clock-names values for i2s nodes

Current dts files with 'i2s' nodes are manually verified.
In order to automate this process rockchip-i2s.txt
has to be converted to yaml. In the new setup dtbs_check with
rockchip-i2s.yaml expect clocks and clock-names values
in the same order. Fix this for some older Rockchip models.

make ARCH=arm dtbs_check
DT_SCHEMA_FILES=Documentation/devicetree/bindings/sound/rockchip-i2s.yaml

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Link: https://lore.kernel.org/r/20200311162524.19748-1-jbx6244@gmail.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi
index 3d1b02f45ffd6b9794c54c39f22fa1ec094a7baf..f3fc92e57f1195d0f39fc35cb401bc2f30c4ed5e 100644 (file)
--- a/arch/arm/boot/dts/rk3066a.dtsi
+++ b/arch/arm/boot/dts/rk3066a.dtsi
@@ -160,10 +160,10 @@
                #size-cells = <0>;
                pinctrl-names = "default";
                pinctrl-0 = <&i2s0_bus>;
+               clocks = <&cru SCLK_I2S0>, <&cru HCLK_I2S0>;
+               clock-names = "i2s_clk", "i2s_hclk";
                dmas = <&dmac1_s 4>, <&dmac1_s 5>;
                dma-names = "tx", "rx";
-               clock-names = "i2s_hclk", "i2s_clk";
-               clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>;
                rockchip,playback-channels = <8>;
                rockchip,capture-channels = <2>;
                #sound-dai-cells = <0>;
@@ -178,10 +178,10 @@
                #size-cells = <0>;
                pinctrl-names = "default";
                pinctrl-0 = <&i2s1_bus>;
+               clocks = <&cru SCLK_I2S1>, <&cru HCLK_I2S1>;
+               clock-names = "i2s_clk", "i2s_hclk";
                dmas = <&dmac1_s 6>, <&dmac1_s 7>;
                dma-names = "tx", "rx";
-               clock-names = "i2s_hclk", "i2s_clk";
-               clocks = <&cru HCLK_I2S1>, <&cru SCLK_I2S1>;
                rockchip,playback-channels = <2>;
                rockchip,capture-channels = <2>;
                #sound-dai-cells = <0>;
@@ -196,10 +196,10 @@
                #size-cells = <0>;
                pinctrl-names = "default";
                pinctrl-0 = <&i2s2_bus>;
+               clocks = <&cru SCLK_I2S2>, <&cru HCLK_I2S2>;
+               clock-names = "i2s_clk", "i2s_hclk";
                dmas = <&dmac1_s 9>, <&dmac1_s 10>;
                dma-names = "tx", "rx";
-               clock-names = "i2s_hclk", "i2s_clk";
-               clocks = <&cru HCLK_I2S2>, <&cru SCLK_I2S2>;
                rockchip,playback-channels = <2>;
                rockchip,capture-channels = <2>;
                #sound-dai-cells = <0>;

diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
index 23655677983bc1b22883b018ace97ac26ed47a95..a59f46a4719e62ba44dbfe6cc06c83acea5043a3 100644 (file)
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -170,10 +170,10 @@
                #size-cells = <0>;
                pinctrl-names = "default";
                pinctrl-0 = <&i2s0_bus>;
+               clocks = <&cru SCLK_I2S0>, <&cru HCLK_I2S0>;
+               clock-names = "i2s_clk", "i2s_hclk";
                dmas = <&dmac1_s 6>, <&dmac1_s 7>;
                dma-names = "tx", "rx";
-               clock-names = "i2s_hclk", "i2s_clk";
-               clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>;
                rockchip,playback-channels = <2>;
                rockchip,capture-channels = <2>;
                #sound-dai-cells = <0>;

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index b4e6df725fbb13173824402277885f835ff00e0e..2cfb4cc9b495934a4f710835a3c5ac981c5734e8 100644 (file)
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -970,10 +970,10 @@
                interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
                #address-cells = <1>;
                #size-cells = <0>;
+               clocks = <&cru SCLK_I2S0>, <&cru HCLK_I2S0>;
+               clock-names = "i2s_clk", "i2s_hclk";
                dmas = <&dmac_bus_s 0>, <&dmac_bus_s 1>;
                dma-names = "tx", "rx";
-               clock-names = "i2s_hclk", "i2s_clk";
-               clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>;
                pinctrl-names = "default";
                pinctrl-0 = <&i2s0_bus>;
                rockchip,playback-channels = <8>;