From: Heiko Stuebner <heiko@sntech.de>
Date: Mon, 24 Dec 2018 08:17:45 +0000 (+0100)
Subject: ARM: dts: rockchip: move rk3036 i2s sound-dail-cells into soc dtsi
X-Git-Tag: v5.1-rc1~157^2~12^2~14
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=78720aceacf0932d8475ba249535ce8e4fbbdfda;p=linux-2.6-block.git

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 0fd19f9723df..0173eb11ec28 100644
--- 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 d560fc4051c5..59c90863b0e7 100644
--- 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";
 	};