| From 12bc63872ef77bdcee59c259e199c43f977cddd0 Mon Sep 17 00:00:00 2001 |
| From: Masahiro Yamada <yamada.masahiro@socionext.com> |
| Date: Sat, 25 Nov 2017 01:24:44 +0900 |
| Subject: [PATCH 0467/1795] mmc: tmio: use mmc_can_gpio_cd() instead of |
| checking TMIO_MMC_USE_GPIO_CD |
| |
| To use a GPIO line for card detection, TMIO_MMC_USE_GPIO_CD is set |
| by a legacy board (arch/sh/boards/mach-ecovec24). |
| |
| For DT platforms, the "cd-gpios" property is a legitimate way for that |
| in case the IP-builtin card detection can not be used for some reason. |
| mmc_of_parse() calls mmc_gpiod_request_cd() to set up ctx->cd_gpio if |
| the "cd-gpios" property is specified. |
| |
| To cater to both cases, mmc_can_gpio_cd() is a correct way to check |
| which card detection logic is used. |
| |
| 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> |
| (cherry picked from commit de21dc1d9a2a9fc5023c1fe3a24ba21e68c34928) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/mmc/host/tmio_mmc_core.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c |
| index 61eac261d3de..ef70322d76be 100644 |
| --- a/drivers/mmc/host/tmio_mmc_core.c |
| +++ b/drivers/mmc/host/tmio_mmc_core.c |
| @@ -1232,7 +1232,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, |
| } |
| mmc->max_seg_size = mmc->max_req_size; |
| |
| - _host->native_hotplug = !(pdata->flags & TMIO_MMC_USE_GPIO_CD || |
| + _host->native_hotplug = !(mmc_can_gpio_cd(mmc) || |
| mmc->caps & MMC_CAP_NEEDS_POLL || |
| !mmc_card_is_removable(mmc)); |
| |
| -- |
| 2.19.0 |
| |
