From c2aa082e66f2600a40904ed01891753bb43ae73c Mon Sep 17 00:00:00 2001 From: Subhash Jadavani Date: Mon, 9 Apr 2012 15:23:51 +0530 Subject: [PATCH] mmc: msm_sdcc: remove CONFIG_MMC_MSM_SDIO_SUPPORT completely CONFIG_MMC_MSM_SDIO_SUPPORT config option was added to indicate that host controller is capable of detecting SDIO operational interrupt. But all the current SDCC HW revisions support the SDIO operational interrupt detection, there is no need of this config option any more. Change-Id: I708ddf5b14286f94853d47bbbcee426b12cb9d85 Signed-off-by: Subhash Jadavani --- arch/arm/configs/msm7627a-perf_defconfig | 1 - arch/arm/configs/msm7627a_defconfig | 1 - arch/arm/configs/msm7630-perf_defconfig | 1 - arch/arm/configs/msm7630_defconfig | 1 - arch/arm/configs/msm8660-perf_defconfig | 1 - arch/arm/configs/msm8660_defconfig | 1 - arch/arm/configs/msm9615_defconfig | 1 - drivers/mmc/host/Kconfig | 6 ------ 8 files changed, 13 deletions(-) diff --git a/arch/arm/configs/msm7627a-perf_defconfig b/arch/arm/configs/msm7627a-perf_defconfig index 5b55f99f7a6..1cf5df359d5 100644 --- a/arch/arm/configs/msm7627a-perf_defconfig +++ b/arch/arm/configs/msm7627a-perf_defconfig @@ -303,7 +303,6 @@ CONFIG_MMC_BLOCK_MINORS=32 # CONFIG_MMC_BLOCK_BOUNCE is not set CONFIG_MMC_TEST=m CONFIG_MMC_MSM=y -CONFIG_MMC_MSM_SDIO_SUPPORT=y CONFIG_MMC_MSM_CARD_HW_DETECTION=y CONFIG_MMC_MSM_SDC3_SUPPORT=y CONFIG_MMC_MSM_SDC3_8_BIT_SUPPORT=y diff --git a/arch/arm/configs/msm7627a_defconfig b/arch/arm/configs/msm7627a_defconfig index 7f9c54d49c5..8d31ee6d434 100644 --- a/arch/arm/configs/msm7627a_defconfig +++ b/arch/arm/configs/msm7627a_defconfig @@ -304,7 +304,6 @@ CONFIG_MMC_BLOCK_MINORS=32 # CONFIG_MMC_BLOCK_BOUNCE is not set CONFIG_MMC_TEST=m CONFIG_MMC_MSM=y -CONFIG_MMC_MSM_SDIO_SUPPORT=y CONFIG_MMC_MSM_CARD_HW_DETECTION=y CONFIG_MMC_MSM_SDC3_SUPPORT=y CONFIG_MMC_MSM_SDC3_8_BIT_SUPPORT=y diff --git a/arch/arm/configs/msm7630-perf_defconfig b/arch/arm/configs/msm7630-perf_defconfig index 3ee4132be6c..736f2bb1db1 100644 --- a/arch/arm/configs/msm7630-perf_defconfig +++ b/arch/arm/configs/msm7630-perf_defconfig @@ -334,7 +334,6 @@ CONFIG_MMC_BLOCK_MINORS=32 # CONFIG_MMC_BLOCK_BOUNCE is not set CONFIG_MMC_TEST=m CONFIG_MMC_MSM=y -CONFIG_MMC_MSM_SDIO_SUPPORT=y CONFIG_MMC_MSM_CARD_HW_DETECTION=y # CONFIG_MMC_MSM_SDC1_SUPPORT is not set CONFIG_MMC_MSM_SDC2_8_BIT_SUPPORT=y diff --git a/arch/arm/configs/msm7630_defconfig b/arch/arm/configs/msm7630_defconfig index 1e037ea373f..bc464b4c446 100644 --- a/arch/arm/configs/msm7630_defconfig +++ b/arch/arm/configs/msm7630_defconfig @@ -333,7 +333,6 @@ CONFIG_MMC_BLOCK_MINORS=32 # CONFIG_MMC_BLOCK_BOUNCE is not set CONFIG_MMC_TEST=m CONFIG_MMC_MSM=y -CONFIG_MMC_MSM_SDIO_SUPPORT=y CONFIG_MMC_MSM_CARD_HW_DETECTION=y # CONFIG_MMC_MSM_SDC1_SUPPORT is not set CONFIG_MMC_MSM_SDC2_8_BIT_SUPPORT=y diff --git a/arch/arm/configs/msm8660-perf_defconfig b/arch/arm/configs/msm8660-perf_defconfig index 8c2e3a652d3..e7f1a674a0d 100644 --- a/arch/arm/configs/msm8660-perf_defconfig +++ b/arch/arm/configs/msm8660-perf_defconfig @@ -388,7 +388,6 @@ CONFIG_MMC_BLOCK_MINORS=32 # CONFIG_MMC_BLOCK_BOUNCE is not set CONFIG_MMC_TEST=m CONFIG_MMC_MSM=y -CONFIG_MMC_MSM_SDIO_SUPPORT=y CONFIG_MMC_MSM_CARD_HW_DETECTION=y CONFIG_MMC_MSM_SDC1_8_BIT_SUPPORT=y CONFIG_MMC_MSM_SDC2_8_BIT_SUPPORT=y diff --git a/arch/arm/configs/msm8660_defconfig b/arch/arm/configs/msm8660_defconfig index 0e8388807a1..c8dfd7a3464 100644 --- a/arch/arm/configs/msm8660_defconfig +++ b/arch/arm/configs/msm8660_defconfig @@ -389,7 +389,6 @@ CONFIG_MMC_BLOCK_MINORS=32 # CONFIG_MMC_BLOCK_BOUNCE is not set CONFIG_MMC_TEST=m CONFIG_MMC_MSM=y -CONFIG_MMC_MSM_SDIO_SUPPORT=y CONFIG_MMC_MSM_CARD_HW_DETECTION=y CONFIG_MMC_MSM_SDC1_8_BIT_SUPPORT=y CONFIG_MMC_MSM_SDC2_8_BIT_SUPPORT=y diff --git a/arch/arm/configs/msm9615_defconfig b/arch/arm/configs/msm9615_defconfig index 70cba0f4f80..601f235d5b2 100644 --- a/arch/arm/configs/msm9615_defconfig +++ b/arch/arm/configs/msm9615_defconfig @@ -245,7 +245,6 @@ CONFIG_MMC_BLOCK_MINORS=32 # CONFIG_MMC_BLOCK_BOUNCE is not set CONFIG_MMC_TEST=m CONFIG_MMC_MSM=y -CONFIG_MMC_MSM_SDIO_SUPPORT=y CONFIG_MMC_MSM_CARD_HW_DETECTION=y CONFIG_MMC_MSM_SPS_SUPPORT=y CONFIG_NEW_LEDS=y diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index ddb38819ef2..14d8b75e643 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -449,12 +449,6 @@ config MMC_MSM 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