diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-01-17 11:28:08 -0500 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2018-03-05 03:08:51 -0500 |
commit | 3ca1507b5b3bba2a7d610659fb93c666282f83e5 (patch) | |
tree | b52bbff049a72167e486c300d11e9d76040d1ddb | |
parent | 2ad1db059b9a4874b05bac49dba22c8b8e68afd4 (diff) |
sh: kfr2r09: use MMC_CAP2_NO_WRITE_PROTECT instead of TMIO own flag
TMIO_MMC_WRPROTECT_DISABLE is equivalent to MMC_CAP2_NO_WRITE_PROTECT.
The flag is propagated as follows:
tmio_mmc_data::capabilities2 -> mmc_host::caps2
Only the difference is the TMIO_... makes tmio_mmc_get_ro() return 0
(i.e. it does not affect mmc_gpio_get_ro() at all), while MMC_CAP2_...
returns 0 before calling ->get_ro() hook (i.e. it affects both IP own
logic and GPIO detection).
The TMIO MMC drivers do not set-up gpio_ro by themselves, so gpio_ro
is obviously unused by legacy boards like this. So, this conversion
should be safe.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
-rw-r--r-- | arch/sh/boards/mach-kfr2r09/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c index 5deb2d82f19f..6af7777332fc 100644 --- a/arch/sh/boards/mach-kfr2r09/setup.c +++ b/arch/sh/boards/mach-kfr2r09/setup.c | |||
@@ -375,8 +375,8 @@ static struct resource kfr2r09_sh_sdhi0_resources[] = { | |||
375 | static struct tmio_mmc_data sh7724_sdhi0_data = { | 375 | static struct tmio_mmc_data sh7724_sdhi0_data = { |
376 | .chan_priv_tx = (void *)SHDMA_SLAVE_SDHI0_TX, | 376 | .chan_priv_tx = (void *)SHDMA_SLAVE_SDHI0_TX, |
377 | .chan_priv_rx = (void *)SHDMA_SLAVE_SDHI0_RX, | 377 | .chan_priv_rx = (void *)SHDMA_SLAVE_SDHI0_RX, |
378 | .flags = TMIO_MMC_WRPROTECT_DISABLE, | ||
379 | .capabilities = MMC_CAP_SDIO_IRQ, | 378 | .capabilities = MMC_CAP_SDIO_IRQ, |
379 | .capabilities2 = MMC_CAP2_NO_WRITE_PROTECT, | ||
380 | }; | 380 | }; |
381 | 381 | ||
382 | static struct platform_device kfr2r09_sh_sdhi0_device = { | 382 | static struct platform_device kfr2r09_sh_sdhi0_device = { |