ARM: dts: rockchip: move rk3036 i2s sound-dail-cells into soc dtsi

The Rockchip i2s controller always only has one output connection
hence #sound-dai-cells is always 0. Therefore define it in the soc
dtsi itself instead of in individual boards.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts
index 0fd19f9723dfcd73fda9f285588bb005a1c4627f..0173eb11ec28828b5abe2625f47d280d220d2b70 100644 (file)
--- a/arch/arm/boot/dts/rk3036-kylin.dts
+++ b/arch/arm/boot/dts/rk3036-kylin.dts
@@ -310,7 +310,6 @@
 };
 
 &i2s {
-       #sound-dai-cells = <0>;
        status = "okay";
 };
 

diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index d560fc4051c5f7a355a0896f0e5d0e76e41acbeb..59c90863b0e7a7a544889d27c896e6e4aee88f8b 100644 (file)
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -289,6 +289,7 @@
                dma-names = "tx", "rx";
                pinctrl-names = "default";
                pinctrl-0 = <&i2s_bus>;
+               #sound-dai-cells = <0>;
                status = "disabled";
        };