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 36b2741eba6e752103d3d8a61edf0c9785f5211e..271b3ba2c2f159ed07622380ddb1bf4ae2e9a1c8 100755 (executable)
--- 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 189cd8083ec0570bebb59cdbbc957487cae53bb2..29a3f617a439817f1c9461ad5ccd63f6d0ef0980 100755 (executable)
--- 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 1370e6198918434e380456a0445d0fffa20276cc..9215d94fb36176a7a82d019eb28a79bda8445ec2 100755 (executable)
--- 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 285b12123e488fab568cde9421efb2da4b34d8c7..d5e5b47c5d0d67f894eb332b1283f1dd84b2a1e9 100755 (executable)
--- 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 168651404a204846f8aa57e8b7e4fd927668a696..647b99f91b6b5644b740244f2a0a2ced867d45a7 100644 (file)
--- 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