summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMursalin Akon <makon@nvidia.com>2011-10-07 17:52:33 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:49:17 -0800
commitfe9ce1f6ad0f847221e09b8baafbf66e2483b883 (patch)
tree28a5494200bfe309ba720a235638e510c437d579 /arch
parentba0fcf47dffb73876e2f16c0b75bb0f610f8b7c8 (diff)
ARM: tegra[3]: config: enable misc MMC options
Enable MMC SDIO, deferred resume and paranoid SD Bug 876711, 876553 Change-Id: Ica05f5b30860f1814f54ce48ecd5b0d0235225d5 Signed-off-by: Mursalin Akon <makon@nvidia.com> Reviewed-on: http://git-master/r/56830 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com> Rebase-Id: R5358adb23bd7c69f01925aa35aa191a2ebc87231
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/tegra3_defconfig3
-rw-r--r--arch/arm/configs/tegra_defconfig3
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/configs/tegra3_defconfig b/arch/arm/configs/tegra3_defconfig
index 26318c83b5bd..2d778e0e8a93 100644
--- a/arch/arm/configs/tegra3_defconfig
+++ b/arch/arm/configs/tegra3_defconfig
@@ -145,6 +145,9 @@ CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_TEGRA_OTG=y
CONFIG_MMC=y
+CONFIG_MMC_EMBEDDED_SDIO=y
+CONFIG_MMC_PARANOID_SD_INIT=y
+CONFIG_MMC_BLOCK_DEFERRED_RESUME=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_PLTFM=y
CONFIG_MMC_SDHCI_TEGRA=y
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index 98fa037c261a..cbb8affa9332 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -116,6 +116,9 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_TEGRA=y
CONFIG_USB_TEGRA_OTG=y
CONFIG_MMC=y
+CONFIG_MMC_EMBEDDED_SDIO=y
+CONFIG_MMC_PARANOID_SD_INIT=y
+CONFIG_MMC_BLOCK_DEFERRED_RESUME=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_PLTFM=y
CONFIG_MMC_SDHCI_TEGRA=y