From 982e18519e8ece17e0f200441f28c0a11dbe94bc Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Sat, 11 Dec 2010 12:29:00 +0800 Subject: [PATCH] rk29sdk: defconfig add wm8900 --- arch/arm/configs/rk29_sdk_defconfig | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/arch/arm/configs/rk29_sdk_defconfig b/arch/arm/configs/rk29_sdk_defconfig index 87d7ff9d535a..562680a451d2 100755 --- a/arch/arm/configs/rk29_sdk_defconfig +++ b/arch/arm/configs/rk29_sdk_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.9 -# Thu Dec 9 14:06:05 2010 +# Sat Dec 11 12:17:37 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -196,6 +196,7 @@ CONFIG_MMU=y CONFIG_ARCH_RK29=y CONFIG_WIFI_CONTROL_FUNC=y CONFIG_MACH_RK29SDK=y +CONFIG_MACH_RK29SDK_MEM_SIZE_M=512 # # RK29 VPU (Video Processing Unit) support @@ -230,7 +231,7 @@ CONFIG_ARM_THUMBEE=y # CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_BPREDICT_DISABLE is not set CONFIG_HAS_TLS_REG=y -CONFIG_ARM_L1_CACHE_SHIFT=5 +CONFIG_ARM_L1_CACHE_SHIFT=6 # CONFIG_ARM_ERRATA_430973 is not set # CONFIG_ARM_ERRATA_458693 is not set # CONFIG_ARM_ERRATA_460075 is not set @@ -917,6 +918,7 @@ CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_TIMER=y CONFIG_SND_PCM=y +CONFIG_SND_JACK=y # CONFIG_SND_SEQUENCER is not set # CONFIG_SND_MIXER_OSS is not set # CONFIG_SND_PCM_OSS is not set @@ -931,13 +933,20 @@ CONFIG_SND_PCM=y # CONFIG_SND_OPL4_LIB_SEQ is not set # CONFIG_SND_SBAWE_SEQ is not set # CONFIG_SND_EMU10K1_SEQ is not set -CONFIG_SND_DRIVERS=y -CONFIG_SND_DUMMY=y -# CONFIG_SND_MTPAV is not set -# CONFIG_SND_SERIAL_U16550 is not set -# CONFIG_SND_MPU401 is not set +# CONFIG_SND_DRIVERS is not set # CONFIG_SND_ARM is not set -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=y +CONFIG_SND_RK29_SOC=y +CONFIG_SND_RK29_SOC_I2S=y +CONFIG_SND_RK29_SOC_I2S_2CH=y +# CONFIG_SND_RK29_SOC_I2S_8CH is not set +# CONFIG_SND_RK29_SOC_WM8988 is not set +CONFIG_SND_RK29_SOC_WM8900=y +CONFIG_SND_RK29_CODEC_SOC_MASTER=y +# CONFIG_SND_RK29_CODEC_SOC_SLAVE is not set +CONFIG_SND_SOC_I2C_AND_SPI=y +# CONFIG_SND_SOC_ALL_CODECS is not set +CONFIG_SND_SOC_WM8900=y # CONFIG_SOUND_PRIME is not set # CONFIG_HID_SUPPORT is not set # CONFIG_USB_SUPPORT is not set -- 2.34.1