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

diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
index bd937d6..2dc0fad 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
@@ -290,7 +290,6 @@
 &spdif {
        pinctrl-0 = <&spdifm0_tx>;
        status = "okay";
-       #sound-dai-cells = <0>;
 
        spdif_p0: port {
                spdif_p0_0: endpoint {

diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
index 14ea005..81cc3c9 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -184,6 +184,7 @@
                clock-names = "i2s_clk", "i2s_hclk";
                dmas = <&dmac 11>, <&dmac 12>;
                dma-names = "tx", "rx";
+               #sound-dai-cells = <0>;
                status = "disabled";
        };
 
@@ -195,6 +196,7 @@
                clock-names = "i2s_clk", "i2s_hclk";
                dmas = <&dmac 14>, <&dmac 15>;
                dma-names = "tx", "rx";
+               #sound-dai-cells = <0>;
                status = "disabled";
        };
 
@@ -206,6 +208,7 @@
                clock-names = "i2s_clk", "i2s_hclk";
                dmas = <&dmac 0>, <&dmac 1>;
                dma-names = "tx", "rx";
+               #sound-dai-cells = <0>;
                status = "disabled";
        };
 
@@ -219,6 +222,7 @@
                dma-names = "tx";
                pinctrl-names = "default";
                pinctrl-0 = <&spdifm2_tx>;
+               #sound-dai-cells = <0>;
                status = "disabled";
        };