From 27877254469738ea225306d85aa6883f20c98eee Mon Sep 17 00:00:00 2001 From: Sahitya Tummala Date: Thu, 29 Jul 2010 16:57:41 +0530 Subject: [PATCH] --- yaml --- r: 209343 b: refs/heads/master c: edd4dd0e987919ed672376c5c73c32aacfc24f39 h: refs/heads/master i: 209341: 8a502fb6e97c947ffc7b3c71e765b13f8e430da3 209339: 3e4d2d0eef9e7657ae59e4f1fe51b458fa10a2a1 209335: 0f6101335244c9932fd85d2c0dbbf8c48beba698 209327: c5062e3186a2f50cadd618af69387814e3ce4408 209311: da33a5764b71ebeb438aa3642aff9df17f3d92a0 209279: 7029db16b3985971a083d8dd20e063ea6d725a43 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/Kconfig | 2 +- trunk/drivers/mmc/host/msm_sdcc.c | 13 +------------ 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 9db30c74926f..498713bafa9e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08ecfde47534ced67c3c16a15845456e83bd31d1 +refs/heads/master: edd4dd0e987919ed672376c5c73c32aacfc24f39 diff --git a/trunk/drivers/mmc/host/Kconfig b/trunk/drivers/mmc/host/Kconfig index f06d06e7fdfa..e171e77f6129 100644 --- a/trunk/drivers/mmc/host/Kconfig +++ b/trunk/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/trunk/drivers/mmc/host/msm_sdcc.c b/trunk/drivers/mmc/host/msm_sdcc.c index 57e00cffb26b..60e424ebce5b 100644 --- a/trunk/drivers/mmc/host/msm_sdcc.c +++ b/trunk/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