shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 04:10:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

codec : Support rk3126-sdk codec

Browse Source
This commit is contained in:
Sun Mingjun
2014-08-12 17:43:23 +08:00
parent 9c542eb57d
commit f854ea25c4
5 changed files with 67 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
arch/arm/boot/dts/rk3126-sdk.dts
View File

@@ -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 {

27
arch/arm/boot/dts/rk3128-box.dts
View File

@@ -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;
};
};
};
};

26
arch/arm/boot/dts/rk312x.dtsi
View File

@@ -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;
};
};
};
};

3
arch/arm/configs/rockchip_defconfig
View File

@@ -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

2
sound/soc/rockchip/Kconfig
View File

@@ -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"