Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4486baca authored by Heiko Stuebner's avatar Heiko Stuebner
Browse files

arm64: dts: rockchip: generalize rk3399 #sound-dai-cells 



The soc spdif and i2s controllers always only have one compontent, so
always require #sound-dai-cells to be 0. Therefore there is no need to
duplicate this property in individual boards.

So move them to rk3399.dtsi.

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

arch/arm64/boot/dts/rockchip/rk3399-firefly.dts

+0 −3
Original line number Diff line number Diff line
@@ -492,19 +492,16 @@ 
&i2s0 {

	rockchip,playback-channels = <8>;

	rockchip,capture-channels = <8>;

	#sound-dai-cells = <0>;

	status = "okay";

};



&i2s1 {

	rockchip,playback-channels = <2>;

	rockchip,capture-channels = <2>;

	#sound-dai-cells = <0>;

	status = "okay";

};



&i2s2 {

	#sound-dai-cells = <0>;

	status = "okay";

};

arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -402,7 +402,6 @@ 
	pinctrl-0 = <&i2s0_2ch_bus>;

	rockchip,playback-channels = <2>;

	rockchip,capture-channels = <2>;

	#sound-dai-cells = <0>;

	status = "okay";

};

arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts

+0 −2
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ 
&i2s0 {

	rockchip,playback-channels = <8>;

	rockchip,capture-channels = <8>;

	#sound-dai-cells = <0>;

	status = "okay";

};
@@ -198,6 +197,5 @@ 
&spdif {

	i2c-scl-rising-time-ns = <450>;

	i2c-scl-falling-time-ns = <15>;

	#sound-dai-cells = <0>;

	status = "okay";

};

arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -425,7 +425,6 @@ 
};



&i2s2 {

	#sound-dai-cells = <0>;

	status = "okay";

};

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

+3 −0
Original line number Diff line number Diff line
@@ -1483,6 +1483,7 @@ 
		pinctrl-names = "default";

		pinctrl-0 = <&spdif_bus>;

		power-domains = <&power RK3399_PD_SDIOAUDIO>;

		#sound-dai-cells = <0>;

		status = "disabled";

	};
@@ -1498,6 +1499,7 @@ 
		pinctrl-names = "default";

		pinctrl-0 = <&i2s0_8ch_bus>;

		power-domains = <&power RK3399_PD_SDIOAUDIO>;

		#sound-dai-cells = <0>;

		status = "disabled";

	};
@@ -1512,6 +1514,7 @@ 
		pinctrl-names = "default";

		pinctrl-0 = <&i2s1_2ch_bus>;

		power-domains = <&power RK3399_PD_SDIOAUDIO>;

		#sound-dai-cells = <0>;

		status = "disabled";

	};