summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2013-05-27 14:30:15 +0200
committerLinus Walleij <linus.walleij@linaro.org>2013-05-27 14:34:56 +0200
commit8487662994aaf2b66ab72a096a05b8404daa6eeb (patch)
tree3b2dfdcc8d6c1cca31650ba3550221db04273b3d /arch/arm/configs
parentd78b655050bbb917069839d5aa1a051f0d867566 (diff)
downloadlinux-8487662994aaf2b66ab72a096a05b8404daa6eeb.tar.gz
linux-8487662994aaf2b66ab72a096a05b8404daa6eeb.tar.bz2
linux-8487662994aaf2b66ab72a096a05b8404daa6eeb.zip
ARM: ux500: Update MMC configs for u8500 defconfig
Enable MMC_UNSAFE_RESUME to be 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/arm/configs')
-rw-r--r--arch/arm/configs/u8500_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index da353e0755b0..b2326b019b83 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -83,7 +83,8 @@ CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MUSB_HDRC=y
CONFIG_USB_ETH=m
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