2 files changed, 2 insertions, 13 deletions

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index f06d06e7fdfa..e171e77f6129 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -249,7 +249,7 @@ config MMC_IMX
 
 config MMC_MSM7X00A
         tristate "Qualcomm MSM 7X00A SDCC Controller Support"
-        depends on MMC && ARCH_MSM && !ARCH_MSM7X30
+        depends on MMC && ARCH_MSM
         help
           This provides support for the SD/MMC cell found in the
           MSM 7X00A controllers from Qualcomm.
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index 57e00cffb26b..60e424ebce5b 100644
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -160,18 +160,7 @@ msmsdcc_stop_data(struct msmsdcc_host *host)
 
 uint32_t msmsdcc_fifo_addr(struct msmsdcc_host *host)
 {
-        switch (host->pdev_id) {
-        case 1:
-                return MSM_SDC1_PHYS + MMCIFIFO;
-        case 2:
-                return MSM_SDC2_PHYS + MMCIFIFO;
-        case 3:
-                return MSM_SDC3_PHYS + MMCIFIFO;
-        case 4:
-                return MSM_SDC4_PHYS + MMCIFIFO;
-        }
-        BUG();
-        return 0;
+        return host->memres->start + MMCIFIFO;
 }
 
 static inline void