rk2926/rk3026/rk3028a/rk3168/rk3188 : defconfig select CONFIG_SDMMC2_…

…RK29
turkerali · Aug 4, 2014 · 5968538 · 5968538
1 parent 81c282f
commit 5968538
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 1 deletion.
diff --git a/arch/arm/configs/rk2926_sdk_defconfig b/arch/arm/configs/rk2926_sdk_defconfig
@@ -375,9 +375,11 @@ CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_EMBEDDED_SDIO=y
 CONFIG_MMC_PARANOID_SD_INIT=y
+CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_SDMMC_RK29=y
 CONFIG_SDMMC0_RK29_SDCARD_DET_FROM_GPIO=y
 # CONFIG_SDMMC1_RK29 is not set
+CONFIG_SDMMC2_RK29=y
 CONFIG_SWITCH=y
 CONFIG_SWITCH_GPIO=y
 CONFIG_RTC_CLASS=y

diff --git a/arch/arm/configs/rk2926_tb_defconfig b/arch/arm/configs/rk2926_tb_defconfig
@@ -371,9 +371,11 @@ CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_EMBEDDED_SDIO=y
 CONFIG_MMC_PARANOID_SD_INIT=y
+CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_SDMMC_RK29=y
 CONFIG_SDMMC0_RK29_SDCARD_DET_FROM_GPIO=y
 # CONFIG_SDMMC1_RK29 is not set
+CONFIG_SDMMC2_RK29=y
 CONFIG_SWITCH=y
 CONFIG_SWITCH_GPIO=y
 CONFIG_RTC_CLASS=y

diff --git a/arch/arm/configs/rk2926_v86_defconfig b/arch/arm/configs/rk2926_v86_defconfig
@@ -378,9 +378,11 @@ CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_EMBEDDED_SDIO=y
 CONFIG_MMC_PARANOID_SD_INIT=y
+CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_SDMMC_RK29=y
 CONFIG_SDMMC0_RK29_SDCARD_DET_FROM_GPIO=y
 # CONFIG_SDMMC1_RK29 is not set
+CONFIG_SDMMC2_RK29=y
 CONFIG_SWITCH=y
 CONFIG_SWITCH_GPIO=y
 CONFIG_RTC_CLASS=y

diff --git a/arch/arm/configs/rk2928_tb_defconfig b/arch/arm/configs/rk2928_tb_defconfig
@@ -370,6 +370,7 @@ CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_EMBEDDED_SDIO=y
 CONFIG_MMC_PARANOID_SD_INIT=y
 CONFIG_SDMMC_RK29=y
+CONFIG_SDMMC2_RK29=y
 CONFIG_SWITCH=y
 CONFIG_SWITCH_GPIO=y
 CONFIG_RTC_CLASS=y

diff --git a/arch/arm/configs/rk3026_86v_android-4.4_defconfig b/arch/arm/configs/rk3026_86v_android-4.4_defconfig
@@ -341,6 +341,7 @@ CONFIG_SND_RK29_SOC=y
 CONFIG_SND_I2SO_USE_DOUBLE_CHANNELS=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK_SOC_RK3026=y
+CONFIG_SND_CAP=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y
 CONFIG_UHID=y
 CONFIG_USB_HIDDEV=y
@@ -414,9 +415,10 @@ CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_EMBEDDED_SDIO=y
 CONFIG_MMC_PARANOID_SD_INIT=y
-CONFIG_MMC_BLOCK_MINORS=12
+CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_SDMMC_RK29=y
 CONFIG_SDMMC0_RK29_SDCARD_DET_FROM_GPIO=y
+CONFIG_SDMMC2_RK29=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y

diff --git a/arch/arm/configs/rk3028a_86v_4.4_defconfig b/arch/arm/configs/rk3028a_86v_4.4_defconfig
@@ -343,6 +343,7 @@ CONFIG_SND_I2SO_USE_DOUBLE_CHANNELS=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK_SOC_HDMI_I2S=y
 CONFIG_SND_RK_SOC_RK3026=y
+CONFIG_SND_CAP=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y
 CONFIG_UHID=y
 CONFIG_USB_HIDDEV=y
@@ -416,7 +417,9 @@ CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_EMBEDDED_SDIO=y
 CONFIG_MMC_PARANOID_SD_INIT=y
+CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_SDMMC_RK29=y
+CONFIG_SDMMC2_RK29=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y

diff --git a/arch/arm/configs/rk3066_sdk_android-4.4_defconfig b/arch/arm/configs/rk3066_sdk_android-4.4_defconfig
@@ -396,7 +396,9 @@ CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_EMBEDDED_SDIO=y
 CONFIG_MMC_PARANOID_SD_INIT=y
+CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_SDMMC_RK29=y
+CONFIG_SDMMC2_RK29=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y

diff --git a/arch/arm/configs/rk3168_86v_android-4.4_defconfig b/arch/arm/configs/rk3168_86v_android-4.4_defconfig
@@ -403,7 +403,9 @@ CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_EMBEDDED_SDIO=y
 CONFIG_MMC_PARANOID_SD_INIT=y
+CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_SDMMC_RK29=y
+CONFIG_SDMMC2_RK29=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y

diff --git a/arch/arm/configs/rk3168_86v_codec_android-4.4_defconfig b/arch/arm/configs/rk3168_86v_codec_android-4.4_defconfig
@@ -315,6 +315,7 @@ CONFIG_FB_ROCKCHIP=y
 CONFIG_ONE_LCDC_DUAL_OUTPUT_INF=y
 CONFIG_LCDC_RK3066B=y
 CONFIG_LCD_E242868_1024X600=y
+CONFIG_RK_TRSM=y
 CONFIG_RGA_RK30=y
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set

diff --git a/arch/arm/configs/rk3168_rk616_86v_android-4.4_defconfig b/arch/arm/configs/rk3168_rk616_86v_android-4.4_defconfig
@@ -403,7 +403,9 @@ CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_EMBEDDED_SDIO=y
 CONFIG_MMC_PARANOID_SD_INIT=y
+CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_SDMMC_RK29=y
+CONFIG_SDMMC2_RK29=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y

diff --git a/arch/arm/configs/rk3168_tb_android-4.4_defconfig b/arch/arm/configs/rk3168_tb_android-4.4_defconfig
@@ -406,7 +406,9 @@ CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_EMBEDDED_SDIO=y
 CONFIG_MMC_PARANOID_SD_INIT=y
+CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_SDMMC_RK29=y
+CONFIG_SDMMC2_RK29=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y

diff --git a/arch/arm/configs/rk3188_ds1006h_android-4.4_defconfig b/arch/arm/configs/rk3188_ds1006h_android-4.4_defconfig
@@ -322,6 +322,7 @@ CONFIG_LCDC_RK3188=y
 CONFIG_LCDC0_RK3188=y
 CONFIG_LCDC1_RK3188=y
 CONFIG_LCD_DS1006H=y
+CONFIG_RK_TRSM=y
 CONFIG_RK_HDMI=y
 CONFIG_HDMI_CAT66121=y
 CONFIG_RK_HDMI_CTL_CODEC=y

diff --git a/arch/arm/configs/rk3188_tb_android-4.4_defconfig b/arch/arm/configs/rk3188_tb_android-4.4_defconfig
@@ -406,7 +406,9 @@ CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_EMBEDDED_SDIO=y
 CONFIG_MMC_PARANOID_SD_INIT=y
+CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_SDMMC_RK29=y
+CONFIG_SDMMC2_RK29=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y

diff --git a/arch/arm/configs/rk3188_tb_android-4.4_wifi_mt6620_defconfig b/arch/arm/configs/rk3188_tb_android-4.4_wifi_mt6620_defconfig
@@ -408,7 +408,9 @@ CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_EMBEDDED_SDIO=y
 CONFIG_MMC_PARANOID_SD_INIT=y
+CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_SDMMC_RK29=y
+CONFIG_SDMMC2_RK29=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y