Commit b78442b8 authored by Heiko Stuebner's avatar Heiko Stuebner
Browse files

arm64: dts: rockchip: move rk3328 #sound-dai-cells to the soc dtsi 



The rk3328 i2s and spdif controllers only ever have one output
connection, so as with all implementations of the rk3066 i2s
controllers we can keep the #sound-dai-cells in the main dtsi
instead of having it repeated in each board.

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

arch/arm64/boot/dts/rockchip/rk3328-rock64.dts

+0 −1
Original line number Original line Diff line number Diff line
@@ -290,7 +290,6 @@ 
&spdif {

&spdif {

	pinctrl-0 = <&spdifm0_tx>;

	pinctrl-0 = <&spdifm0_tx>;

	status = "okay";

	status = "okay";

	#sound-dai-cells = <0>;





	spdif_p0: port {

	spdif_p0: port {

		spdif_p0_0: endpoint {

		spdif_p0_0: endpoint {

arch/arm64/boot/dts/rockchip/rk3328.dtsi

+4 −0
Original line number Original line Diff line number Diff line
@@ -184,6 +184,7 @@ 
		clock-names = "i2s_clk", "i2s_hclk";

		clock-names = "i2s_clk", "i2s_hclk";

		dmas = <&dmac 11>, <&dmac 12>;

		dmas = <&dmac 11>, <&dmac 12>;

		dma-names = "tx", "rx";

		dma-names = "tx", "rx";

		#sound-dai-cells = <0>;

		status = "disabled";

		status = "disabled";

	};

	};
@@ -195,6 +196,7 @@ 
		clock-names = "i2s_clk", "i2s_hclk";

		clock-names = "i2s_clk", "i2s_hclk";

		dmas = <&dmac 14>, <&dmac 15>;

		dmas = <&dmac 14>, <&dmac 15>;

		dma-names = "tx", "rx";

		dma-names = "tx", "rx";

		#sound-dai-cells = <0>;

		status = "disabled";

		status = "disabled";

	};

	};
@@ -206,6 +208,7 @@ 
		clock-names = "i2s_clk", "i2s_hclk";

		clock-names = "i2s_clk", "i2s_hclk";

		dmas = <&dmac 0>, <&dmac 1>;

		dmas = <&dmac 0>, <&dmac 1>;

		dma-names = "tx", "rx";

		dma-names = "tx", "rx";

		#sound-dai-cells = <0>;

		status = "disabled";

		status = "disabled";

	};

	};
@@ -219,6 +222,7 @@ 
		dma-names = "tx";

		dma-names = "tx";

		pinctrl-names = "default";

		pinctrl-names = "default";

		pinctrl-0 = <&spdifm2_tx>;

		pinctrl-0 = <&spdifm2_tx>;

		#sound-dai-cells = <0>;

		status = "disabled";

		status = "disabled";

	};

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE