From 940092be44d05a4c1c7ed3bff5903a01ce6c293c Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=82=B1=E5=BB=BA=E6=96=8C?= Date: Fri, 29 Apr 2011 10:11:12 +0800 Subject: [PATCH] rk29_phone: wm8994 menuconfig fix --- arch/arm/configs/rk29_a22_defconfig | 27 ++++++--- arch/arm/configs/rk29_phonesdk_defconfig | 72 ++++++++++-------------- drivers/headset_observe/rk_headset.h | 10 ++-- sound/soc/codecs/wm8994.c | 2 +- 4 files changed, 56 insertions(+), 55 deletions(-) diff --git a/arch/arm/configs/rk29_a22_defconfig b/arch/arm/configs/rk29_a22_defconfig index d45026b818e6..5fd1f858bf26 100755 --- a/arch/arm/configs/rk29_a22_defconfig +++ b/arch/arm/configs/rk29_a22_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.27 -# Sun Apr 10 18:01:55 2011 +# Fri Apr 29 10:10:51 2011 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -606,6 +606,7 @@ CONFIG_APANIC=y CONFIG_APANIC_PLABEL="kpanic" # CONFIG_STE is not set CONFIG_MTK23D=y +# CONFIG_FM580X is not set # CONFIG_C2PORT is not set # @@ -904,6 +905,7 @@ CONFIG_UART2_CTS_RTS_RK29=y CONFIG_UART3_RK29=y # CONFIG_UART3_CTS_RTS_RK29 is not set CONFIG_SERIAL_RK29_CONSOLE=y +# CONFIG_SERIAL_SC8800 is not set CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set # CONFIG_LEGACY_PTYS is not set @@ -1120,6 +1122,7 @@ CONFIG_SOC_CAMERA=y # CONFIG_SOC_CAMERA_MT9T031 is not set # CONFIG_SOC_CAMERA_MT9P111 is not set # CONFIG_SOC_CAMERA_MT9D112 is not set +# CONFIG_SOC_CAMERA_MT9D113 is not set # CONFIG_SOC_CAMERA_MT9V022 is not set # CONFIG_SOC_CAMERA_TW9910 is not set # CONFIG_SOC_CAMERA_PLATFORM is not set @@ -1129,9 +1132,20 @@ CONFIG_SOC_CAMERA=y # CONFIG_SOC_CAMERA_OV2659 is not set # CONFIG_SOC_CAMERA_OV9650 is not set CONFIG_SOC_CAMERA_OV3640=y +CONFIG_OV3640_AUTOFOCUS=y +# CONFIG_OV3640_FIXEDFOCUS is not set # CONFIG_SOC_CAMERA_OV5642 is not set # CONFIG_SOC_CAMERA_OV5640 is not set # CONFIG_SOC_CAMERA_S5K6AA is not set +# CONFIG_SOC_CAMERA_GT2005 is not set +# CONFIG_SOC_CAMERA_GC0308 is not set +# CONFIG_SOC_CAMERA_GC0309 is not set +# CONFIG_SOC_CAMERA_GC2015 is not set +# CONFIG_SOC_CAMERA_HI253 is not set +# CONFIG_SOC_CAMERA_HI704 is not set +# CONFIG_SOC_CAMERA_SIV120B is not set +# CONFIG_SOC_CAMERA_SID130B is not set +# CONFIG_SOC_CAMERA_NT99250 is not set # CONFIG_VIDEO_SH_MOBILE_CEU is not set CONFIG_VIDEO_RK29=y CONFIG_VIDEO_RK29_WORK_ONEFRAME=y @@ -1245,6 +1259,7 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set # CONFIG_BACKLIGHT_RK29_BL is not set +CONFIG_FIH_TOUCHKEY_LED=y # # Display device support @@ -1311,10 +1326,8 @@ CONFIG_SND_JACK=y # CONFIG_SND_EMU10K1_SEQ is not set # CONFIG_SND_DRIVERS is not set # CONFIG_SND_ARM is not set -CONFIG_SND_SPI=y -CONFIG_SND_USB=y -# CONFIG_SND_USB_AUDIO is not set -# CONFIG_SND_USB_CAIAQ is not set +# CONFIG_SND_SPI is not set +# CONFIG_SND_USB is not set CONFIG_SND_SOC=y CONFIG_SND_RK29_SOC=y CONFIG_SND_RK29_SOC_I2S=y @@ -1325,8 +1338,8 @@ CONFIG_SND_RK29_SOC_I2S_8CH=y # CONFIG_SND_RK29_SOC_alc5621 is not set # CONFIG_SND_RK29_SOC_alc5631 is not set CONFIG_SND_RK29_SOC_WM8994=y -CONFIG_SND_RK29_CODEC_SOC_MASTER=y -# CONFIG_SND_RK29_CODEC_SOC_SLAVE is not set +# CONFIG_SND_RK29_CODEC_SOC_MASTER is not set +CONFIG_SND_RK29_CODEC_SOC_SLAVE=y CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_ALL_CODECS is not set CONFIG_SND_SOC_WM8994=y diff --git a/arch/arm/configs/rk29_phonesdk_defconfig b/arch/arm/configs/rk29_phonesdk_defconfig index 7dc19922ec2a..17260355cda6 100755 --- a/arch/arm/configs/rk29_phonesdk_defconfig +++ b/arch/arm/configs/rk29_phonesdk_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.27 -# Mon Apr 11 15:53:09 2011 +# Fri Apr 29 10:09:11 2011 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -201,36 +201,10 @@ CONFIG_WIFI_CONTROL_FUNC=y # CONFIG_MACH_RK29SDK_DDR3 is not set # CONFIG_MACH_RK29WINACCORD is not set # CONFIG_MACH_RK29FIH is not set -# CONFIG_MACH_RK29_AIGO is not set # CONFIG_MACH_RK29_MALATA is not set CONFIG_MACH_RK29_PHONESDK=y # CONFIG_MACH_RK29_A22 is not set -# CONFIG_DDR_TYPE_DDRII is not set -CONFIG_DDR_TYPE_LPDDR=y -# CONFIG_DDR_TYPE_DDR3_800D is not set -# CONFIG_DDR_TYPE_DDR3_800E is not set -# CONFIG_DDR_TYPE_DDR3_1066E is not set -# CONFIG_DDR_TYPE_DDR3_1066F is not set -# CONFIG_DDR_TYPE_DDR3_1066G is not set -# CONFIG_DDR_TYPE_DDR3_1333F is not set -# CONFIG_DDR_TYPE_DDR3_1333G is not set -# CONFIG_DDR_TYPE_DDR3_1333H is not set -# CONFIG_DDR_TYPE_DDR3_1333J is not set -# CONFIG_DDR_TYPE_DDR3_1600G is not set -# CONFIG_DDR_TYPE_DDR3_1600H is not set -# CONFIG_DDR_TYPE_DDR3_1600J is not set -# CONFIG_DDR_TYPE_DDR3_1600K is not set -# CONFIG_DDR_TYPE_DDR3_1866J is not set -# CONFIG_DDR_TYPE_DDR3_1866K is not set -# CONFIG_DDR_TYPE_DDR3_1866L is not set -# CONFIG_DDR_TYPE_DDR3_1866M is not set -# CONFIG_DDR_TYPE_DDR3_2133K is not set -# CONFIG_DDR_TYPE_DDR3_2133L is not set -# CONFIG_DDR_TYPE_DDR3_2133M is not set -# CONFIG_DDR_TYPE_DDR3_2133N is not set -# CONFIG_DDR_TYPE_DDR3_DEFAULT is not set CONFIG_RK29_MEM_SIZE_M=512 -CONFIG_DDR_SDRAM_FREQ=200 # # RK29 VPU (Video Processing Unit) support @@ -632,6 +606,7 @@ CONFIG_APANIC=y CONFIG_APANIC_PLABEL="kpanic" # CONFIG_STE is not set CONFIG_MTK23D=y +# CONFIG_FM580X is not set # CONFIG_C2PORT is not set # @@ -883,16 +858,13 @@ CONFIG_INPUT_LPSENSOR_ISL29028=y # CONFIG_INPUT_GPIO is not set # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set CONFIG_INPUT_WM831X_ON=y - -# -# Magnetometer sensors -# -CONFIG_COMPASS_AK8975=y -# CONFIG_COMPASS_AK8973 is not set +# CONFIG_MAG_SENSORS is not set CONFIG_G_SENSOR_DEVICE=y # CONFIG_GS_MMA7660 is not set CONFIG_GS_MMA8452=y +# CONFIG_GS_L3G4200D is not set # CONFIG_INPUT_JOGBALL is not set +# CONFIG_LIGHT_SENSOR_DEVICE is not set # # Hardware I/O ports @@ -930,7 +902,9 @@ CONFIG_UART1_RK29=y CONFIG_UART2_RK29=y CONFIG_UART2_CTS_RTS_RK29=y CONFIG_UART3_RK29=y +# CONFIG_UART3_CTS_RTS_RK29 is not set CONFIG_SERIAL_RK29_CONSOLE=y +# CONFIG_SERIAL_SC8800 is not set CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set # CONFIG_LEGACY_PTYS is not set @@ -992,7 +966,11 @@ CONFIG_ADC=y # CONFIG_ADC_RK28 is not set CONFIG_ADC_RK29=y # CONFIG_SPI_FPGA is not set -# CONFIG_HEADSET_DET is not set + +# +# Headset device support +# +CONFIG_RK_HEADSET_DET=y # # PPS support @@ -1148,6 +1126,7 @@ CONFIG_SOC_CAMERA=y # CONFIG_SOC_CAMERA_MT9T031 is not set # CONFIG_SOC_CAMERA_MT9P111 is not set # CONFIG_SOC_CAMERA_MT9D112 is not set +# CONFIG_SOC_CAMERA_MT9D113 is not set # CONFIG_SOC_CAMERA_MT9V022 is not set # CONFIG_SOC_CAMERA_TW9910 is not set # CONFIG_SOC_CAMERA_PLATFORM is not set @@ -1162,6 +1141,15 @@ CONFIG_OV5642_AUTOFOCUS=y # CONFIG_OV5642_FIXEDFOCUS is not set # CONFIG_SOC_CAMERA_OV5640 is not set # CONFIG_SOC_CAMERA_S5K6AA is not set +# CONFIG_SOC_CAMERA_GT2005 is not set +# CONFIG_SOC_CAMERA_GC0308 is not set +# CONFIG_SOC_CAMERA_GC0309 is not set +# CONFIG_SOC_CAMERA_GC2015 is not set +# CONFIG_SOC_CAMERA_HI253 is not set +# CONFIG_SOC_CAMERA_HI704 is not set +# CONFIG_SOC_CAMERA_SIV120B is not set +# CONFIG_SOC_CAMERA_SID130B is not set +# CONFIG_SOC_CAMERA_NT99250 is not set # CONFIG_VIDEO_SH_MOBILE_CEU is not set CONFIG_VIDEO_RK29=y CONFIG_VIDEO_RK29_WORK_ONEFRAME=y @@ -1277,6 +1265,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_WM831X=y # CONFIG_BACKLIGHT_RK29_BL is not set +CONFIG_FIH_TOUCHKEY_LED=y # # Display device support @@ -1303,7 +1292,7 @@ CONFIG_LCD_LS035Y8DX02A=y # CONFIG_LCD_IPS1P5680_V1_E is not set # CONFIG_LCD_MCU_TFT480800_25_E is not set # CONFIG_LCD_ILI9803_CPT4_3 is not set -# CONFIG_LCD_ANX7150_720P is not set +# CONFIG_DEFAULT_OUT_HDMI is not set # CONFIG_LCD_AT070TNA2 is not set # @@ -1346,10 +1335,8 @@ CONFIG_SND_JACK=y # CONFIG_SND_EMU10K1_SEQ is not set # CONFIG_SND_DRIVERS is not set # CONFIG_SND_ARM is not set -CONFIG_SND_SPI=y -CONFIG_SND_USB=y -# CONFIG_SND_USB_AUDIO is not set -# CONFIG_SND_USB_CAIAQ is not set +# CONFIG_SND_SPI is not set +# CONFIG_SND_USB is not set CONFIG_SND_SOC=y CONFIG_SND_RK29_SOC=y CONFIG_SND_RK29_SOC_I2S=y @@ -1357,12 +1344,13 @@ CONFIG_SND_RK29_SOC_I2S=y CONFIG_SND_RK29_SOC_I2S_8CH=y # CONFIG_SND_RK29_SOC_WM8988 is not set # CONFIG_SND_RK29_SOC_WM8900 is not set +# CONFIG_SND_RK29_SOC_alc5621 is not set +# CONFIG_SND_RK29_SOC_alc5631 is not set CONFIG_SND_RK29_SOC_WM8994=y -CONFIG_SND_RK29_CODEC_SOC_MASTER=y -# CONFIG_SND_RK29_CODEC_SOC_SLAVE is not set +# CONFIG_SND_RK29_CODEC_SOC_MASTER is not set +CONFIG_SND_RK29_CODEC_SOC_SLAVE=y CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_ALL_CODECS is not set -CONFIG_SND_SOC_WM_HUBS=y CONFIG_SND_SOC_WM8994=y # CONFIG_SOUND_PRIME is not set # CONFIG_HID_SUPPORT is not set diff --git a/drivers/headset_observe/rk_headset.h b/drivers/headset_observe/rk_headset.h index 2d635505ed4e..212a51ae506c 100755 --- a/drivers/headset_observe/rk_headset.h +++ b/drivers/headset_observe/rk_headset.h @@ -1,15 +1,15 @@ -#ifndef RK_HEADSET_H -#define RK_HEADSET_H +#ifndef RK2818_HEADSET_H +#define RK2818_HEADSET_H #define HEADSET_IN_HIGH 0x00000001 #define HEADSET_IN_LOW 0x00000000 -/* ¶ú»úÊý¾Ý½á¹¹Ìå */ + struct rk2818_headset_data { - unsigned int gpio; + unsigned int gpio;//Detection Headset--Must be set unsigned int irq; unsigned int irq_type; - unsigned int headset_in_type; + unsigned int headset_in_type;// Headphones into the state level--Must be set }; #endif diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 613c74d8b20c..3ad885918b39 100755 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -2539,7 +2539,7 @@ int snd_soc_put_route(struct snd_kcontrol *kcontrol, printk("this route not user\n"); break; default: - DBG("wm8994 error route!!!\n"); + printk("wm8994 error route!!!\n"); break; } return 0; -- 2.34.1