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

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
...@@ -492,19 +492,16 @@ accelerometer@68 { ...@@ -492,19 +492,16 @@ accelerometer@68 {
&i2s0 { &i2s0 {
rockchip,playback-channels = <8>; rockchip,playback-channels = <8>;
rockchip,capture-channels = <8>; rockchip,capture-channels = <8>;
#sound-dai-cells = <0>;
status = "okay"; status = "okay";
}; };
&i2s1 { &i2s1 {
rockchip,playback-channels = <2>; rockchip,playback-channels = <2>;
rockchip,capture-channels = <2>; rockchip,capture-channels = <2>;
#sound-dai-cells = <0>;
status = "okay"; status = "okay";
}; };
&i2s2 { &i2s2 {
#sound-dai-cells = <0>;
status = "okay"; status = "okay";
}; };
......
...@@ -402,7 +402,6 @@ &i2s0 { ...@@ -402,7 +402,6 @@ &i2s0 {
pinctrl-0 = <&i2s0_2ch_bus>; pinctrl-0 = <&i2s0_2ch_bus>;
rockchip,playback-channels = <2>; rockchip,playback-channels = <2>;
rockchip,capture-channels = <2>; rockchip,capture-channels = <2>;
#sound-dai-cells = <0>;
status = "okay"; status = "okay";
}; };
......
...@@ -149,7 +149,6 @@ accelerometer@68 { ...@@ -149,7 +149,6 @@ accelerometer@68 {
&i2s0 { &i2s0 {
rockchip,playback-channels = <8>; rockchip,playback-channels = <8>;
rockchip,capture-channels = <8>; rockchip,capture-channels = <8>;
#sound-dai-cells = <0>;
status = "okay"; status = "okay";
}; };
...@@ -198,6 +197,5 @@ &sdio0 { ...@@ -198,6 +197,5 @@ &sdio0 {
&spdif { &spdif {
i2c-scl-rising-time-ns = <450>; i2c-scl-rising-time-ns = <450>;
i2c-scl-falling-time-ns = <15>; i2c-scl-falling-time-ns = <15>;
#sound-dai-cells = <0>;
status = "okay"; status = "okay";
}; };
...@@ -425,7 +425,6 @@ &i2c3 { ...@@ -425,7 +425,6 @@ &i2c3 {
}; };
&i2s2 { &i2s2 {
#sound-dai-cells = <0>;
status = "okay"; status = "okay";
}; };
......
...@@ -1483,6 +1483,7 @@ spdif: spdif@ff870000 { ...@@ -1483,6 +1483,7 @@ spdif: spdif@ff870000 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spdif_bus>; pinctrl-0 = <&spdif_bus>;
power-domains = <&power RK3399_PD_SDIOAUDIO>; power-domains = <&power RK3399_PD_SDIOAUDIO>;
#sound-dai-cells = <0>;
status = "disabled"; status = "disabled";
}; };
...@@ -1498,6 +1499,7 @@ i2s0: i2s@ff880000 { ...@@ -1498,6 +1499,7 @@ i2s0: i2s@ff880000 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2s0_8ch_bus>; pinctrl-0 = <&i2s0_8ch_bus>;
power-domains = <&power RK3399_PD_SDIOAUDIO>; power-domains = <&power RK3399_PD_SDIOAUDIO>;
#sound-dai-cells = <0>;
status = "disabled"; status = "disabled";
}; };
...@@ -1512,6 +1514,7 @@ i2s1: i2s@ff890000 { ...@@ -1512,6 +1514,7 @@ i2s1: i2s@ff890000 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2s1_2ch_bus>; pinctrl-0 = <&i2s1_2ch_bus>;
power-domains = <&power RK3399_PD_SDIOAUDIO>; power-domains = <&power RK3399_PD_SDIOAUDIO>;
#sound-dai-cells = <0>;
status = "disabled"; status = "disabled";
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment