From: Kuninori Morimoto Date: Tue, 13 Jan 2015 04:59:33 +0000 (+0000) Subject: mmc: sh_mobile_sdhi: tidyup mmc_data->bus_shift for latest SoC X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=95a7dc364514b00a42e78ae98376d0b9f4429ac0;p=linux-beck.git mmc: sh_mobile_sdhi: tidyup mmc_data->bus_shift for latest SoC Latest SDHI on Renesas has expand register mapping. update mmc_data->bus_shift for it. Signed-off-by: Kuninori Morimoto Signed-off-by: Ulf Hansson --- diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c index 48a3be804cc0..26eeeb690061 100644 --- a/drivers/mmc/host/sh_mobile_sdhi.c +++ b/drivers/mmc/host/sh_mobile_sdhi.c @@ -202,7 +202,10 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) 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; + if (resource_size(res) > 0x100) + host->bus_shift = 1; + else + host->bus_shift = 0; mmc_data->capabilities = MMC_CAP_MMC_HIGHSPEED; if (p) {