From: Sun Mingjun <smj@rock-chips.com>
Date: Tue, 12 Aug 2014 12:42:13 +0000 (+0800)
Subject: codec : add the general configuration to rk312x.dtsi
X-Git-Tag: firefly_0821_release~4912
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=095128cccb47ae013fb72306487b9c35e5bcef4f;p=firefly-linux-kernel-4.4.55.git

codec : add the general configuration to rk312x.dtsi
---

diff --git a/arch/arm/boot/dts/rk3126-sdk.dts b/arch/arm/boot/dts/rk3126-sdk.dts
index 36b2741eba6e..271b3ba2c2f1 100755
--- a/arch/arm/boot/dts/rk3126-sdk.dts
+++ b/arch/arm/boot/dts/rk3126-sdk.dts
@@ -19,45 +19,8 @@
 		rockchip,remote_wakeup;
 		rockchip,usb_irq_wakeup;
 		};
-	codec: codec@20030000 {
-		compatible = "rk312x-codec";
-		reg = <0x20030000 0x4000>;
-		spk_ctl_io = <&gpio1 GPIO_A0 GPIO_ACTIVE_HIGH>; 
-		//pinctrl-names = "default";
-		//pinctrl-0 = <&i2s_gpio>;
 
-		boot_depop = <1>;
-		pa_enable_time = <1000>;
-		clocks = <&clk_gates5 14>;
-		clock-names = "g_pclk_acodec";
-    	};
-	rockchip-audio {
-		compatible = "audio-rk312x";
-		dais {
-			dai0 {
-				audio-codec = <&codec>;
-				i2s-controller = <&i2s1>;
-				format = "i2s";
-				//continuous-clock;
-				//bitclock-inversion;
-				//frame-inversion;
-				//bitclock-master;
-				//frame-master;
-			};
-			dai1 {
-				audio-codec = <&codec>;
-				i2s-controller = <&i2s1>;
-				format = "i2s";
-				//continuous-clock;
-				//bitclock-inversion;
-				//frame-inversion;
-				//bitclock-master;
-				//frame-master;
-			};
-		};
-	};
-
-	};
+};
 
 &rk_screen {
 	display-timings = <&disp_timings>;
@@ -86,3 +49,8 @@
 &sdmmc {
 	cd-gpios = <&gpio2 GPIO_A3 GPIO_ACTIVE_HIGH>;/*CD GPIO*/
 };
+
+&codec {
+        spk_ctl_io = <&gpio1 GPIO_A0 0>;
+};
+
diff --git a/arch/arm/boot/dts/rk3128-box.dts b/arch/arm/boot/dts/rk3128-box.dts
index 189cd8083ec0..29a3f617a439 100755
--- a/arch/arm/boot/dts/rk3128-box.dts
+++ b/arch/arm/boot/dts/rk3128-box.dts
@@ -50,46 +50,6 @@
 		rockchip,remote_wakeup;
 		rockchip,usb_irq_wakeup;
 	};
-
-	codec: codec@20030000 {
-		compatible = "rk312x-codec";
-		reg = <0x20030000 0x1000>;
-		spk_ctl_io = <&gpio1 GPIO_A3 0>;
-		//pinctrl-names = "default";
-		//pinctrl-0 = <&i2s_gpio>;
-
-		boot_depop = <1>;
-		pa_enable_time = <1000>;
-		clocks = <&clk_gates5 14>;
-		clock-names = "g_pclk_acodec";
-	};
-
-	rockchip-audio {
-                compatible = "audio-rk312x";
-                dais {
-                        dai0 {
-                                audio-codec = <&codec>;
-                                i2s-controller = <&i2s1>;
-                                format = "i2s";
-                                //continuous-clock;
-                                //bitclock-inversion;
-                                //frame-inversion;
-                                //bitclock-master;
-                                //frame-master;
-                        };
-                        dai1 {
-                                audio-codec = <&codec>;
-                                i2s-controller = <&i2s1>;
-                                format = "i2s";
-                                //continuous-clock;
-                                //bitclock-inversion;
-                                //frame-inversion;
-                                //bitclock-master;
-                                //frame-master;
-                        };
-                };
-        };
-
 };
 
 
@@ -183,3 +143,7 @@
 	//power-gpio = <&gpio0 GPIO_A6 GPIO_ACTIVE_HIGH>;
 	reset-gpio = <&gpio2 GPIO_D0 GPIO_ACTIVE_LOW>;
 };
+
+&codec {
+	spk_ctl_io = <&gpio1 GPIO_A3 0>;
+};
diff --git a/arch/arm/boot/dts/rk312x.dtsi b/arch/arm/boot/dts/rk312x.dtsi
index 1370e6198918..9215d94fb361 100755
--- a/arch/arm/boot/dts/rk312x.dtsi
+++ b/arch/arm/boot/dts/rk312x.dtsi
@@ -914,4 +914,39 @@
 			};
 		};
 	};
+	codec: codec@20030000 {
+		compatible = "rk312x-codec";
+		reg = <0x20030000 0x4000>;
+		//pinctrl-names = "default";
+		//pinctrl-0 = <&i2s_gpio>;
+		boot_depop = <1>;
+		pa_enable_time = <1000>;
+		clocks = <&clk_gates5 14>;
+		clock-names = "g_pclk_acodec";
+	};
+	rockchip-audio {
+		compatible = "audio-rk312x";
+		dais {
+			dai0 {
+				audio-codec = <&codec>;
+				i2s-controller = <&i2s1>;
+				format = "i2s";
+				//continuous-clock;
+				//bitclock-inversion;
+				//frame-inversion;
+				//bitclock-master;
+				//frame-master;
+			};
+			dai1 {
+				audio-codec = <&codec>;
+				i2s-controller = <&i2s1>;
+				format = "i2s";
+				//continuous-clock;
+				//bitclock-inversion;
+				//frame-inversion;
+				//bitclock-master;
+				//frame-master;
+			};
+		};
+	};
 };
diff --git a/arch/arm/configs/rk3128_box_defconfig b/arch/arm/configs/rk3128_box_defconfig
index 285b12123e48..d5e5b47c5d0d 100755
--- a/arch/arm/configs/rk3128_box_defconfig
+++ b/arch/arm/configs/rk3128_box_defconfig
@@ -391,8 +391,8 @@ CONFIG_SND_SOC=y
 CONFIG_SND_RK_SOC=y
 CONFIG_SND_RK_SOC_HDMI_SPDIF=y
 CONFIG_SND_RK_SOC_RK312X=y
-#CONFIG_SND_RK_SOC_RT5631 is not set
-#CONFIG_SND_RK_SOC_RT3224 is not set
+CONFIG_SND_RK_SOC_RT5631=y
+CONFIG_SND_RK_SOC_RT3224=y
 CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HIDRAW=y
 CONFIG_UHID=y
diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index 168651404a20..647b99f91b6b 100644
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -384,6 +384,8 @@ CONFIG_SND_SOC=y
 CONFIG_SND_RK_SOC=y
 CONFIG_SND_RK_SOC_HDMI_I2S=y
 CONFIG_SND_RK_SOC_RK312X=y
+CONFIG_SND_RK_SOC_RT5631=y
+CONFIG_SND_RK_SOC_RT3224=y
 CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HIDRAW=y
 CONFIG_UHID=y