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

codec : add the general configuration to rk312x.dtsi

Browse Source
This commit is contained in:
Sun Mingjun
2014-08-12 20:42:13 +08:00
parent f854ea25c4
commit 095128cccb
5 changed files with 49 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

4
arch/arm/configs/rk3128_box_defconfig
View File

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

2
arch/arm/configs/rockchip_defconfig
View File

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