From: qjb <qjb@rock-chips.com>
Date: Wed, 19 Mar 2014 10:10:17 +0000 (+0800)
Subject: rt3224 && rt3261 : dts update
X-Git-Tag: firefly_0821_release~5996
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9f3f48cacbf735b946df355a8db8d361e70e0f10;p=firefly-linux-kernel-4.4.55.git

rt3224 && rt3261 : dts update
---

diff --git a/arch/arm/boot/dts/rk3288-tb.dts b/arch/arm/boot/dts/rk3288-tb.dts
index b9286dd5f6b9..a2011314c383 100755
--- a/arch/arm/boot/dts/rk3288-tb.dts
+++ b/arch/arm/boot/dts/rk3288-tb.dts
@@ -86,6 +86,59 @@
 	codec_hdmi_spdif: codec-hdmi-spdif {
 		compatible = "hdmi-spdif";
 	};
+
+	rockchip-hdmi-i2s {
+		compatible = "rockchip-hdmi-i2s";
+		dais {
+			dai0 {
+				audio-codec = <&codec_hdmi_i2s>;
+				i2s-controller = <&i2s>;
+				format = "i2s";
+				//continuous-clock;
+				//bitclock-inversion;
+				//frame-inversion;
+				//bitclock-master;
+				//frame-master;
+			};
+		};
+	};
+	
+	rockchip-hdmi-spdif {
+		compatible = "rockchip-hdmi-spdif";
+	};
+
+	rockchip-rt5631 {
+		compatible = "rockchip-rt5631";
+		dais {
+			dai0 {
+				audio-codec = <&rt5631>;
+				i2s-controller = <&i2s>;
+				format = "i2s";
+				//continuous-clock;
+				//bitclock-inversion;
+				//frame-inversion;
+				//bitclock-master;
+				//frame-master;
+			};
+		};
+	};
+
+	rockchip-rt3224 {
+		compatible = "rockchip-rt3224";
+		dais {
+			dai0 {
+				audio-codec = <&rt3261>;
+				i2s-controller = <&i2s>;
+				format = "i2s";
+				//continuous-clock;
+				//bitclock-inversion;
+				//frame-inversion;
+				//bitclock-master;
+				//frame-master;
+			};
+		};
+	};
+
 };
 
 &emmc {
@@ -216,6 +269,29 @@
 
 &i2c2 {
 	status = "okay";
+	rt5631: rt5631@1a {
+		compatible = "rt5631";
+		reg = <0x1a>;
+	};
+	es8323: es8323@10 {
+		compatible = "es8323";
+		reg = <0x10>;
+	};
+	rt3261: rt3261@1c {
+		compatible = "rt3261";
+		reg = <0x1c>;
+		codec-en-gpio = <0>;//sdk default high level
+		spk-num= <2>;
+		modem-input-mode = <1>;
+		lout-to-modem_mode = <1>;
+		spk-amplify = <2>;
+		playback-if1-data_control = <0>;
+		playback-if2-data_control = <0>;
+	};
+	rt5616: rt5616@1b {
+		compatible = "rt5616";
+		reg = <0x1b>;
+	};
 };
 
 &i2c3 {
diff --git a/sound/soc/codecs/rt3261.c b/sound/soc/codecs/rt3261.c
index 705148aa9b4d..1f993df97771 100755
--- a/sound/soc/codecs/rt3261.c
+++ b/sound/soc/codecs/rt3261.c
@@ -3582,7 +3582,7 @@ static int rt3261_parse_dt_property(struct device *dev,
 		return -ENODEV;
 
 	rt3261->codec_en_gpio = of_get_named_gpio_flags(node, "codec-en-gpio", 0, &flags);
-	if (rt3261->codec_en_gpio < 0) {
+	if (rt3261->codec_en_gpio <= 0) {
 		DBG("%s() Can not read property codec-en-gpio\n", __FUNCTION__);
 	} else {
 		ret = devm_gpio_request(dev, rt3261->codec_en_gpio, "codec_en_gpio");