From: sugar <sugar.zhang@rock-chips.com>
Date: Mon, 8 Dec 2014 01:40:26 +0000 (+0800)
Subject: i2s: compatable with rk3126/rk3126b/rk3128.
X-Git-Tag: firefly_0821_release~4412
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6e500ff4925bb5d5d270c4214abc128810bda12b;p=firefly-linux-kernel-4.4.55.git

i2s: compatable with rk3126/rk3126b/rk3128.
---

diff --git a/arch/arm/boot/dts/rk3126-sdk.dtsi b/arch/arm/boot/dts/rk3126-sdk.dtsi
index 24b1f5afa85c..9ecc0b400fd1 100755
--- a/arch/arm/boot/dts/rk3126-sdk.dtsi
+++ b/arch/arm/boot/dts/rk3126-sdk.dtsi
@@ -24,3 +24,36 @@
 		<&clk_tsp &clk_gpll>, <&clk_nandc &clk_gpll>,
 		<&clk_mac_pll &clk_cpll>;
 };
+
+&i2s0 {
+	status = "okay";
+};
+
+&i2s1 {
+	status = "disabled";
+};
+
+&rockchip_audio {
+	dais {
+		dai0 {
+			audio-codec = <&codec>;
+			i2s-controller = <&i2s0>;
+			format = "i2s";
+			//continuous-clock;
+			//bitclock-inversion;
+			//frame-inversion;
+			//bitclock-master;
+			//frame-master;
+		};
+		dai1 {
+			audio-codec = <&codec>;
+			i2s-controller = <&i2s0>;
+			format = "i2s";
+			//continuous-clock;
+			//bitclock-inversion;
+			//frame-inversion;
+			//bitclock-master;
+			//frame-master;
+		};
+	};
+};
\ No newline at end of file
diff --git a/arch/arm/boot/dts/rk312x.dtsi b/arch/arm/boot/dts/rk312x.dtsi
index 875a2f2374ac..fe7cd7697f92 100755
--- a/arch/arm/boot/dts/rk312x.dtsi
+++ b/arch/arm/boot/dts/rk312x.dtsi
@@ -967,7 +967,7 @@
 		clocks = <&clk_gates5 14>;
 		clock-names = "g_pclk_acodec";
 	};
-	rockchip-audio {
+	rockchip_audio: audio-rk312x {
 		compatible = "audio-rk312x";
 		dais {
 			dai0 {