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: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
index 86ff1eb45795913da403ae5f4178909f2720277c..e378ddb39eeff6f6456e06753fb958ef86a95ead 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
@@ -492,19 +492,16 @@ accelerometer@68 {
 &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";
 };
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
index 111839a184650c4de47dabe9649cd347d1976824..0130b9f98c9deefca654794f941e7dec85e655c0 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
@@ -402,7 +402,6 @@ &i2s0 {
        pinctrl-0 = <&i2s0_2ch_bus>;
        rockchip,playback-channels = <2>;
        rockchip,capture-channels = <2>;
-       #sound-dai-cells = <0>;
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
index 3768e1623e4fba785422ba80ab7384600593598e..fef2c06089993c38a76096df356fdf1406fa34f1 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
@@ -149,7 +149,6 @@ accelerometer@68 {
 &i2s0 {
        rockchip,playback-channels = <8>;
        rockchip,capture-channels = <8>;
-       #sound-dai-cells = <0>;
        status = "okay";
 };
 
@@ -198,6 +197,5 @@ &sdio0 {
 &spdif {
        i2c-scl-rising-time-ns = <450>;
        i2c-scl-falling-time-ns = <15>;
-       #sound-dai-cells = <0>;
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
index 5dada565429c92aded8eec83a91897c8d0f16f10..36b60791c156d2ace112850571418d0410f81bd7 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
@@ -425,7 +425,6 @@ &i2c3 {
 };
 
 &i2s2 {
-       #sound-dai-cells = <0>;
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index ff63d9e93b4ad0b9fcc1ac0257634eb52b4b0b52..adb037cd80fef3c01e803433fd8018b5cf517dee 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -1483,6 +1483,7 @@ spdif: spdif@ff870000 {
                pinctrl-names = "default";
                pinctrl-0 = <&spdif_bus>;
                power-domains = <&power RK3399_PD_SDIOAUDIO>;
+               #sound-dai-cells = <0>;
                status = "disabled";
        };
 
@@ -1498,6 +1499,7 @@ i2s0: i2s@ff880000 {
                pinctrl-names = "default";
                pinctrl-0 = <&i2s0_8ch_bus>;
                power-domains = <&power RK3399_PD_SDIOAUDIO>;
+               #sound-dai-cells = <0>;
                status = "disabled";
        };
 
@@ -1512,6 +1514,7 @@ i2s1: i2s@ff890000 {
                pinctrl-names = "default";
                pinctrl-0 = <&i2s1_2ch_bus>;
                power-domains = <&power RK3399_PD_SDIOAUDIO>;
+               #sound-dai-cells = <0>;
                status = "disabled";
        };