Commit d4502e63 authored by Johan Jonker's avatar Johan Jonker Committed by Heiko Stuebner
Browse files

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: default avatarJohan Jonker <jbx6244@gmail.com>
Link: https://lore.kernel.org/r/20200311162524.19748-1-jbx6244@gmail.com


Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent dff03873

arch/arm/boot/dts/rk3066a.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/rk3188.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/rk3288.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -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>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE