From f854ea25c463954f2f2b240a9844343e66207c65 Mon Sep 17 00:00:00 2001 From: Sun Mingjun Date: Tue, 12 Aug 2014 17:43:23 +0800 Subject: [PATCH] codec : Support rk3126-sdk codec --- arch/arm/boot/dts/rk3126-sdk.dts | 38 +++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3128-box.dts | 27 ++++++++++++++++++++ arch/arm/boot/dts/rk312x.dtsi | 26 -------------------- arch/arm/configs/rockchip_defconfig | 3 +-- sound/soc/rockchip/Kconfig | 2 +- 5 files changed, 67 insertions(+), 29 deletions(-) diff --git a/arch/arm/boot/dts/rk3126-sdk.dts b/arch/arm/boot/dts/rk3126-sdk.dts index eeb4943f91c4..36b2741eba6e 100755 --- 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 ed241b9fdbf1..189cd8083ec0 100755 --- 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 d91db92bcbbd..1370e6198918 100755 --- 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 f91676f2d95e..168651404a20 100644 --- 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 14236fd321a0..c5ae2dd99100 100644 --- 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" -- 2.34.1