From da905252b915287ab84126854c05dc63e6e5b299 Mon Sep 17 00:00:00 2001 From: ChenJQ Date: Tue, 21 Sep 2010 12:13:48 -0700 Subject: [PATCH] set menuconfig for wm8994 codec --- arch/arm/configs/rk2818_info_defconfig | 14 ++++++++++++++ arch/arm/configs/rk2818_info_it50_defconfig | 14 ++++++++++++++ arch/arm/configs/rk2818_raho_defconfig | 14 ++++++++++++++ sound/soc/codecs/wm8994.c | 6 +++--- 4 files changed, 45 insertions(+), 3 deletions(-) diff --git a/arch/arm/configs/rk2818_info_defconfig b/arch/arm/configs/rk2818_info_defconfig index 728783dc91b7..0ab7dab69815 100755 --- a/arch/arm/configs/rk2818_info_defconfig +++ b/arch/arm/configs/rk2818_info_defconfig @@ -1190,6 +1190,20 @@ CONFIG_SND_ROCKCHIP_SOC=y CONFIG_SND_ROCKCHIP_SOC_I2S=y # CONFIG_SND_ROCKCHIP_SOC_WM8988 is not set CONFIG_SND_ROCKCHIP_SOC_WM8994=y +# CONFIG_SND_INSIDE_EARPIECE is not set +CONFIG_SND_OUTSIDE_EARPIECE=y +# CONFIG_SND_NO_EARPIECE is not set +CONFIG_SND_BB_NORMAL_INPUT=y +# CONFIG_SND_BB_DIFFERENTIAL_INPUT is not set +CONFIG_WM8994_SPEAKER_INCALL_VOL=15 +CONFIG_WM8994_SPEAKER_INCALL_MIC_VOL=15 +CONFIG_WM8994_SPEAKER_NORMAL_VOL=15 +CONFIG_WM8994_HEADSET_INCALL_VOL=-9 +CONFIG_WM8994_HEADSET_INCALL_MIC_VOL=-6 +CONFIG_WM8994_HEADSET_NORMAL_VOL=15 +CONFIG_WM8994_BT_INCALL_VOL=15 +CONFIG_WM8994_BT_INCALL_MIC_VOL=15 +CONFIG_WM8994_RECORDER_VOL=-16 CONFIG_SND_CODEC_SOC_MASTER=y # CONFIG_SND_CODEC_SOC_SLAVE is not set CONFIG_SND_SOC_I2C_AND_SPI=y diff --git a/arch/arm/configs/rk2818_info_it50_defconfig b/arch/arm/configs/rk2818_info_it50_defconfig index d2c2f6dd78b5..3a81c3d77eea 100644 --- a/arch/arm/configs/rk2818_info_it50_defconfig +++ b/arch/arm/configs/rk2818_info_it50_defconfig @@ -1165,6 +1165,20 @@ CONFIG_SND_ROCKCHIP_SOC=y CONFIG_SND_ROCKCHIP_SOC_I2S=y # CONFIG_SND_ROCKCHIP_SOC_WM8988 is not set CONFIG_SND_ROCKCHIP_SOC_WM8994=y +# CONFIG_SND_INSIDE_EARPIECE is not set +# CONFIG_SND_OUTSIDE_EARPIECE is not set +CONFIG_SND_NO_EARPIECE=y +CONFIG_SND_BB_NORMAL_INPUT=y +# CONFIG_SND_BB_DIFFERENTIAL_INPUT is not set +CONFIG_WM8994_SPEAKER_INCALL_VOL=15 +CONFIG_WM8994_SPEAKER_INCALL_MIC_VOL=15 +CONFIG_WM8994_SPEAKER_NORMAL_VOL=15 +CONFIG_WM8994_HEADSET_INCALL_VOL=-9 +CONFIG_WM8994_HEADSET_INCALL_MIC_VOL=-6 +CONFIG_WM8994_HEADSET_NORMAL_VOL=15 +CONFIG_WM8994_BT_INCALL_VOL=15 +CONFIG_WM8994_BT_INCALL_MIC_VOL=15 +CONFIG_WM8994_RECORDER_VOL=-16 CONFIG_SND_CODEC_SOC_MASTER=y # CONFIG_SND_CODEC_SOC_SLAVE is not set CONFIG_SND_SOC_I2C_AND_SPI=y diff --git a/arch/arm/configs/rk2818_raho_defconfig b/arch/arm/configs/rk2818_raho_defconfig index 28d572c07188..875b00585e15 100755 --- a/arch/arm/configs/rk2818_raho_defconfig +++ b/arch/arm/configs/rk2818_raho_defconfig @@ -1115,6 +1115,20 @@ CONFIG_SND_ROCKCHIP_SOC=y CONFIG_SND_ROCKCHIP_SOC_I2S=y # CONFIG_SND_ROCKCHIP_SOC_WM8988 is not set CONFIG_SND_ROCKCHIP_SOC_WM8994=y +CONFIG_SND_INSIDE_EARPIECE=y +# CONFIG_SND_OUTSIDE_EARPIECE is not set +# CONFIG_SND_NO_EARPIECE is not set +# CONFIG_SND_BB_NORMAL_INPUT is not set +CONFIG_SND_BB_DIFFERENTIAL_INPUT=y +CONFIG_WM8994_SPEAKER_INCALL_VOL=15 +CONFIG_WM8994_SPEAKER_INCALL_MIC_VOL=15 +CONFIG_WM8994_SPEAKER_NORMAL_VOL=15 +CONFIG_WM8994_HEADSET_INCALL_VOL=-9 +CONFIG_WM8994_HEADSET_INCALL_MIC_VOL=-6 +CONFIG_WM8994_HEADSET_NORMAL_VOL=15 +CONFIG_WM8994_BT_INCALL_VOL=15 +CONFIG_WM8994_BT_INCALL_MIC_VOL=15 +CONFIG_WM8994_RECORDER_VOL=-16 CONFIG_SND_CODEC_SOC_MASTER=y # CONFIG_SND_CODEC_SOC_SLAVE is not set CONFIG_SND_SOC_I2C_AND_SPI=y diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index ebd8a0ac9b0e..9c89b65dbdbc 100755 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -760,7 +760,6 @@ void handsetMIC_to_baseband_to_headset_and_record(void) void mainMIC_to_baseband_to_earpiece(void) { -#ifndef CONFIG_SND_NO_EARPIECE DBG("%s::%d\n",__FUNCTION__,__LINE__); if(wm8994_current_mode==wm8994_mainMIC_to_baseband_to_earpiece)return; @@ -790,6 +789,7 @@ void mainMIC_to_baseband_to_earpiece(void) wm8994_write(0x04, 0x0303); // AIF1ADC1L_ENA=1, AIF1ADC1R_ENA=1, ADCL_ENA=1, ADCR_ENA=1 wm8994_write(0x05, 0x0303); wm8994_write(0x1F, 0x0000); +#if defined(CONFIG_SND_INSIDE_EARPIECE)||defined(CONFIG_SND_OUTSIDE_EARPIECE) vol=CONFIG_WM8994_EARPIECE_INCALL_VOL; if(vol>30)vol=30; if(vol<-27)vol=-27; @@ -826,7 +826,7 @@ void mainMIC_to_baseband_to_earpiece(void) #ifdef CONFIG_SND_OUTSIDE_EARPIECE wm8994_write(0x28, 0x0030); //IN1LP_TO_IN1L IN1LN_TO_IN1L wm8994_write(0x34, 0x0002); //IN1L_TO_LINEOUT1P - vol=CONFIG_WM8994_EARPIECE_INCALL_MIC_VOL; + vol=CONFIG_WM8994_HEADSET_INCALL_MIC_VOL; if(vol>30)vol=30; if(vol<-22)vol=-22; if(vol<-16){ @@ -837,6 +837,7 @@ void mainMIC_to_baseband_to_earpiece(void) wm8994_write(0x18, 320+(vol+16)*10/15); //mic vol } #endif +#endif #ifdef CONFIG_SND_BB_NORMAL_INPUT wm8994_write(0x2D, 0x0003); //bit 1 IN2LP_TO_MIXOUTL bit 12 DAC1L_TO_HPOUT1L 0x0102 wm8994_write(0x2E, 0x0003); //bit 1 IN2RP_TO_MIXOUTR bit 12 DAC1R_TO_HPOUT1R 0x0102 @@ -863,7 +864,6 @@ void mainMIC_to_baseband_to_earpiece(void) wm8994_write(0x305, 0x0040); // AIF1 DACLRCK DIV-----BCLK/64 wm8994_write(0x302, 0x4000); // AIF1_MSTR=1 #endif -#endif } void mainMIC_to_baseband_to_earpiece_I2S(void) -- 2.34.1