phone-pad:modify phone pad default configs.

diff --git a/arch/arm/configs/rk29_phonepadsdk_defconfig b/arch/arm/configs/rk29_phonepadsdk_defconfig
old mode 100755 (executable)
new mode 100644 (file)
index b0bb4a1..55b92af
--- a/arch/arm/configs/rk29_phonepadsdk_defconfig
+++ b/arch/arm/configs/rk29_phonepadsdk_defconfig
@@ -1155,7 +1155,7 @@ CONFIG_ADC_RK29=y
 #
 # Headset device support
 #
-# CONFIG_RK_HEADSET_DET is not set
+CONFIG_RK_HEADSET_DET=y
 
 #
 # PPS support
@@ -1505,15 +1505,17 @@ CONFIG_SND_RK29_SOC_I2S=y
 # CONFIG_SND_RK29_SOC_I2S_2CH is not set
 CONFIG_SND_RK29_SOC_I2S_8CH=y
 # CONFIG_SND_RK29_SOC_WM8988 is not set
-CONFIG_SND_RK29_SOC_WM8900=y
+# 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 is not set
+# CONFIG_SND_RK29_SOC_RT5625 is not set
+CONFIG_SND_RK29_SOC_WM8994=y
+# CONFIG_SND_RK29_SOC_CS42L52 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_WM8900=y
+CONFIG_SND_SOC_WM8994=y
 # CONFIG_SOUND_PRIME is not set
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
@@ -1762,14 +1764,13 @@ CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_EMBEDDED_SDIO=y
-# CONFIG_MMC_PARANOID_SD_INIT is not set
-
+CONFIG_MMC_PARANOID_SD_INIT=y
 #
 # MMC/SD/SDIO Card Drivers
 #
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_MMC_BLOCK_DEFERRED_RESUME=y
+# CONFIG_MMC_BLOCK_DEFERRED_RESUME is not set
 # CONFIG_SDIO_UART is not set
 # CONFIG_MMC_TEST is not set
 
@@ -1781,8 +1782,8 @@ CONFIG_SDMMC_RK29=y
 #
 # Now, there are two SDMMC controllers selected, SDMMC0 and SDMMC1.
 #
+# CONFIG_SDMMC_RK29_OLD is not set
 CONFIG_SDMMC0_RK29=y
-# CONFIG_EMMC_RK29 is not set
 CONFIG_SDMMC1_RK29=y
 # CONFIG_MMC_SDHCI is not set
 # CONFIG_MMC_AT91 is not set