diff options
| author | Sahitya Tummala <stummala@codeaurora.org> | 2010-07-29 07:27:41 -0400 |
|---|---|---|
| committer | Daniel Walker <dwalker@codeaurora.org> | 2010-08-09 19:05:20 -0400 |
| commit | edd4dd0e987919ed672376c5c73c32aacfc24f39 (patch) | |
| tree | 176c0d8d79a627fdeedaf41f50244de4949f8f22 | |
| parent | 08ecfde47534ced67c3c16a15845456e83bd31d1 (diff) | |
mmc: msm_sdcc: Compile the driver for msm7x30
The controller base address is referred from platform
resource instead of using #defines. This fixes the
compilation error when driver is compiled for msm7x30.
Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
| -rw-r--r-- | drivers/mmc/host/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/mmc/host/msm_sdcc.c | 13 |
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 | |||
| 249 | 249 | ||
| 250 | config MMC_MSM7X00A | 250 | config MMC_MSM7X00A |
| 251 | tristate "Qualcomm MSM 7X00A SDCC Controller Support" | 251 | tristate "Qualcomm MSM 7X00A SDCC Controller Support" |
| 252 | depends on MMC && ARCH_MSM && !ARCH_MSM7X30 | 252 | depends on MMC && ARCH_MSM |
| 253 | help | 253 | help |
| 254 | This provides support for the SD/MMC cell found in the | 254 | This provides support for the SD/MMC cell found in the |
| 255 | MSM 7X00A controllers from Qualcomm. | 255 | 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) | |||
| 160 | 160 | ||
| 161 | uint32_t msmsdcc_fifo_addr(struct msmsdcc_host *host) | 161 | uint32_t msmsdcc_fifo_addr(struct msmsdcc_host *host) |
| 162 | { | 162 | { |
| 163 | switch (host->pdev_id) { | 163 | return host->memres->start + MMCIFIFO; |
| 164 | case 1: | ||
| 165 | return MSM_SDC1_PHYS + MMCIFIFO; | ||
| 166 | case 2: | ||
| 167 | return MSM_SDC2_PHYS + MMCIFIFO; | ||
| 168 | case 3: | ||
| 169 | return MSM_SDC3_PHYS + MMCIFIFO; | ||
| 170 | case 4: | ||
| 171 | return MSM_SDC4_PHYS + MMCIFIFO; | ||
| 172 | } | ||
| 173 | BUG(); | ||
| 174 | return 0; | ||
| 175 | } | 164 | } |
| 176 | 165 | ||
| 177 | static inline void | 166 | static inline void |
