Initial Contribution
msm-2.6.38: tag AU_LINUX_ANDROID_GINGERBREAD.02.03.04.00.142
Signed-off-by: Bryan Huntsman <bryanh@codeaurora.org>
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 56dbf3f..7378c62 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -442,6 +442,148 @@
config MMC_TMIO_CORE
tristate
+config MMC_MSM
+ tristate "Qualcomm SDCC Controller Support"
+ depends on MMC && ARCH_MSM
+ help
+ This provides support for the SD/MMC cell found in the
+ MSM and QSD SOCs from Qualcomm.
+
+config MMC_MSM_SDIO_SUPPORT
+ boolean "Qualcomm MSM SDIO support"
+ depends on MMC_MSM
+ help
+ This enables SDIO support in the msm_sdcc driver.
+
+config MMC_MSM_CARD_HW_DETECTION
+ boolean "Qualcomm MMC Hardware detection support"
+ depends on MMC_MSM
+ default n
+ help
+ Select Y if the hardware has support to detect card insertion/removal.
+
+config MMC_MSM_SDC1_SUPPORT
+ boolean "Qualcomm SDC1 support"
+ depends on MMC_MSM
+ default y
+ help
+ Select Y to enable Slot 1.
+
+config MMC_MSM_SDC1_8_BIT_SUPPORT
+ boolean "Qualcomm SDC1 8bit support"
+ depends on MMC_MSM_SDC1_SUPPORT
+ default n
+ help
+ Select Y to enable 8bit support for Slot 1.
+
+config MMC_MSM_SDC1_DUMMY52_REQUIRED
+ boolean "Send dummy 52 read for SDC1"
+ depends on MMC_MSM_SDC1_SUPPORT
+ default n
+ help
+ Select Y to enable sending dummy 52 reads to complete
+ all data commands. Required for some SDIO cards.
+ If unsure, say N.
+
+config MMC_MSM_SDC2_SUPPORT
+ boolean "Qualcomm SDC2 support"
+ depends on MMC_MSM
+ default y
+ help
+ Select Y to enable Slot 2.
+
+config MMC_MSM_SDC2_8_BIT_SUPPORT
+ boolean "Qualcomm SDC2 8bit support"
+ depends on MMC_MSM_SDC2_SUPPORT
+ default n
+ help
+ Select Y to enable 8bit support for Slot 2.
+
+config MMC_MSM_SDC2_DUMMY52_REQUIRED
+ boolean "Send dummy 52 read for SDC2"
+ depends on MMC_MSM_SDC2_SUPPORT
+ default n
+ help
+ Select Y to enable sending dummy 52 reads to complete
+ all data commands. Required for some SDIO cards.
+ If unsure, say N.
+
+config MMC_MSM_SDC3_SUPPORT
+ boolean "Qualcomm SDC3 support"
+ depends on MMC_MSM
+ default n
+ help
+ Select Y to enable Slot 3.
+
+config MMC_MSM_SDC3_8_BIT_SUPPORT
+ boolean "Qualcomm SDC3 8bit support"
+ depends on MMC_MSM_SDC3_SUPPORT
+ default n
+ help
+ Select Y to enable 8bit support for Slot 3.
+
+config MMC_MSM_SDC3_DUMMY52_REQUIRED
+ boolean "Send dummy 52 read for SDC3"
+ depends on MMC_MSM_SDC3_SUPPORT
+ default n
+ help
+ Select Y to enable sending dummy 52 reads to complete
+ all data commands. Required for some SDIO cards.
+ If unsure, say N.
+
+config MMC_MSM_SDC4_SUPPORT
+ boolean "Qualcomm SDC4 support"
+ depends on MMC_MSM
+ default n
+ help
+ Select Y to enable Slot 4.
+
+config MMC_MSM_SDC4_8_BIT_SUPPORT
+ boolean "Qualcomm SDC4 8bit support"
+ depends on MMC_MSM_SDC4_SUPPORT
+ default n
+ help
+ Select Y to enable 8bit support for Slot 4.
+
+config MMC_MSM_SDC4_DUMMY52_REQUIRED
+ boolean "Send dummy 52 read for SDC4"
+ depends on MMC_MSM_SDC4_SUPPORT
+ default n
+ help
+ Select Y to enable sending dummy 52 reads to complete
+ all data commands. Required for some SDIO cards.
+ If unsure, say N.
+
+config MMC_MSM_SDC5_SUPPORT
+ boolean "Qualcomm SDC5 support"
+ depends on MMC_MSM
+ default n
+ help
+ Select Y to enable Slot 5.
+
+config MMC_MSM_SDC5_8_BIT_SUPPORT
+ boolean "Qualcomm SDC5 8bit support"
+ depends on MMC_MSM_SDC5_SUPPORT
+ default n
+ help
+ Select Y to enable 8bit support for Slot 5.
+
+config MMC_MSM_SDC5_DUMMY52_REQUIRED
+ boolean "Send dummy 52 read for SDC5"
+ depends on MMC_MSM_SDC5_SUPPORT
+ default n
+ help
+ Select Y to enable sending dummy 52 reads to complete
+ all data commands. Required for some SDIO cards.
+ If unsure, say N.
+
+config MMC_MSM_SPS_SUPPORT
+ bool "Use SPS BAM as data mover"
+ depends on MMC_MSM && SPS
+ default n
+ help
+ Select Y to use SPS BAM as data mover
+
config MMC_TMIO
tristate "Toshiba Mobile IO Controller (TMIO) MMC/SD function support"
depends on MFD_TMIO || MFD_ASIC3