summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2013-05-27 15:16:06 +0200
committerLinus Walleij <linus.walleij@linaro.org>2013-07-20 11:59:43 +0200
commit9af588736f48401cca6a39a96a59fb994068237f (patch)
tree6631d2fac80f8bca19f490824d112227a897884f /arch
parentad81f0545ef01ea651886dddac4bef6cec930092 (diff)
ARM: nomadik: Update MMC defconfigs
Enable MMC_UNSAFE_RESUME to accomplish a proper suspend/resume cycle for SD/SDIO/(e)MMC. ARMMMCI host driver supports clock gating through runtime PM, thus MMC_CLKGATE is not needed. Moreover ARMMMCI can do scatter-gather which means we can explicity disable MMC_BLOCK_BOUNCE, since it's default enabled, to skip unnecessary bounce buffer copying. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/nhk8815_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/nhk8815_defconfig b/arch/arm/configs/nhk8815_defconfig
index 35f8cf299fa2..b605575f3225 100644
--- a/arch/arm/configs/nhk8815_defconfig
+++ b/arch/arm/configs/nhk8815_defconfig
@@ -95,7 +95,8 @@ CONFIG_I2C_NOMADIK=y
CONFIG_DEBUG_GPIO=y
# CONFIG_HWMON is not set
CONFIG_MMC=y
-CONFIG_MMC_CLKGATE=y
+CONFIG_MMC_UNSAFE_RESUME=y
+# CONFIG_MMC_BLOCK_BOUNCE is not set
CONFIG_MMC_ARMMMCI=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y