summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/sh_mobile_sdhi.c
diff options
context:
space:
mode:
authorKuninori Morimoto2015-01-13 05:58:20 +0100
committerUlf Hansson2015-01-20 10:22:48 +0100
commit7445bf9e6f4e5d7755e22c7c9b06f4ae0d6160c6 (patch)
treee12be5f236a6ad6788379ab67c02749d5118be0b /drivers/mmc/host/sh_mobile_sdhi.c
parentmmc: tmio: tmio_mmc_host has .multi_io_quirk (diff)
downloadkernel-qcow2-linux-7445bf9e6f4e5d7755e22c7c9b06f4ae0d6160c6.tar.gz
kernel-qcow2-linux-7445bf9e6f4e5d7755e22c7c9b06f4ae0d6160c6.tar.xz
kernel-qcow2-linux-7445bf9e6f4e5d7755e22c7c9b06f4ae0d6160c6.zip
mmc: tmio: tmio_mmc_host has .bus_shift
Current .bus_shift is implemented under tmio_mmc_data. It goes to tmio_mmc_host by this patch. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/host/sh_mobile_sdhi.c')
-rw-r--r--drivers/mmc/host/sh_mobile_sdhi.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c
index c92efe59284d..0db2a0a0376b 100644
--- a/drivers/mmc/host/sh_mobile_sdhi.c
+++ b/drivers/mmc/host/sh_mobile_sdhi.c
@@ -218,6 +218,8 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)
host->clk_enable = sh_mobile_sdhi_clk_enable;
host->clk_disable = sh_mobile_sdhi_clk_disable;
host->multi_io_quirk = sh_mobile_sdhi_multi_io_quirk;
+ /* SD control register space size is 0x100, 0x200 for bus_shift=1 */
+ host->bus_shift = resource_size(res) >> 9;
mmc_data->capabilities = MMC_CAP_MMC_HIGHSPEED;
if (p) {
@@ -277,9 +279,6 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)
dma_priv->dma_rx_offset = of_data->dma_rx_offset;
}
- /* SD control register space size is 0x100, 0x200 for bus_shift=1 */
- mmc_data->bus_shift = resource_size(res) >> 9;
-
ret = tmio_mmc_host_probe(host, mmc_data);
if (ret < 0)
goto efree;