From: sugar <sugar.zhang@rock-chips.com>
Date: Fri, 5 Dec 2014 06:36:00 +0000 (+0800)
Subject: rk3126/rk3126b: i2s: use i2s_2ch.
X-Git-Tag: firefly_0821_release~4414
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=942d98b30dd2c9907b4f53c160a16ee4216745a0;p=firefly-linux-kernel-4.4.55.git

rk3126/rk3126b: i2s: use i2s_2ch.
---

diff --git a/arch/arm/boot/dts/rk312x.dtsi b/arch/arm/boot/dts/rk312x.dtsi
index 875a2f2374ac..d92bf5c7799b 100755
--- a/arch/arm/boot/dts/rk312x.dtsi
+++ b/arch/arm/boot/dts/rk312x.dtsi
@@ -483,7 +483,6 @@
 		//pinctrl-names = "default", "sleep";
 		//pinctrl-0 = <&i2s0_mclk &i2s0_sclk &i2s0_lrckrx &i2s0_lrcktx &i2s0_sdi &i2s0_sdo>;
 		//pinctrl-1 = <&i2s0_gpio>;
-		status = "disabled";
 	};
 
 	i2s1: i2s@10200000 {
@@ -496,6 +495,7 @@
 		dmas = <&pdma 14>, <&pdma 15>;
 		//#dma-cells = <2>;
 		dma-names = "tx", "rx";
+		status = "disabled";
 	};
 
 	spdif: spdif@10204000 {
@@ -972,7 +972,7 @@
 		dais {
 			dai0 {
 				audio-codec = <&codec>;
-				i2s-controller = <&i2s1>;
+				i2s-controller = <&i2s0>;
 				format = "i2s";
 				//continuous-clock;
 				//bitclock-inversion;
@@ -982,7 +982,7 @@
 			};
 			dai1 {
 				audio-codec = <&codec>;
-				i2s-controller = <&i2s1>;
+				i2s-controller = <&i2s0>;
 				format = "i2s";
 				//continuous-clock;
 				//bitclock-inversion;