codec : Support rk3126-sdk codec

diff --git a/arch/arm/boot/dts/rk3126-sdk.dts b/arch/arm/boot/dts/rk3126-sdk.dts
index eeb4943f91c48ffd8b239929d5aa1abfb6195049..36b2741eba6e752103d3d8a61edf0c9785f5211e 100755 (executable)
--- a/arch/arm/boot/dts/rk3126-sdk.dts
+++ b/arch/arm/boot/dts/rk3126-sdk.dts
@@ -19,6 +19,44 @@
                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 {

diff --git a/arch/arm/boot/dts/rk3128-box.dts b/arch/arm/boot/dts/rk3128-box.dts
index ed241b9fdbf1c95b4afbf8cb749e62a2d2d3e1f3..189cd8083ec0570bebb59cdbbc957487cae53bb2 100755 (executable)
--- a/arch/arm/boot/dts/rk3128-box.dts
+++ b/arch/arm/boot/dts/rk3128-box.dts
@@ -63,6 +63,33 @@
                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/boot/dts/rk312x.dtsi b/arch/arm/boot/dts/rk312x.dtsi
index d91db92bcbbd3366d177ce29f417c81490a8b3bd..1370e6198918434e380456a0445d0fffa20276cc 100755 (executable)
--- a/arch/arm/boot/dts/rk312x.dtsi
+++ b/arch/arm/boot/dts/rk312x.dtsi
@@ -914,30 +914,4 @@
                        };
                };
        };
-
-       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/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index f91676f2d95ef9da478d28514f0394d044eabe1b..168651404a204846f8aa57e8b7e4fd927668a696 100644 (file)
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -383,8 +383,7 @@ CONFIG_SND_USB_AUDIO=y
 CONFIG_SND_SOC=y
 CONFIG_SND_RK_SOC=y
 CONFIG_SND_RK_SOC_HDMI_I2S=y
-CONFIG_SND_RK_SOC_RT5631=y
-CONFIG_SND_RK_SOC_RT3224=y
+CONFIG_SND_RK_SOC_RK312X=y
 CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HIDRAW=y
 CONFIG_UHID=y

diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig
index 14236fd321a0b0109b6dc6f0b7654182df3cdf46..c5ae2dd99100f330ce699adf195c976a57c68277 100644 (file)
--- a/sound/soc/rockchip/Kconfig
+++ b/sound/soc/rockchip/Kconfig
@@ -256,7 +256,7 @@ config SND_RK_SOC_RK312X
         select SND_SOC_RK312X
         help
           Say Y if you want to add support for SoC audio on rockchip
-          with the RK3036 s40.
+          with the rk3128 && rk3126 internal codec.
 
 config SND_RK_SOC_RK610
        tristate "SoC I2S Audio support for rockchip - RK610"