| From 7973e911d4d74aada0a908f39f0d88631baf592d Mon Sep 17 00:00:00 2001 |
| From: Masahiro Yamada <yamada.masahiro@socionext.com> |
| Date: Sat, 25 Nov 2017 01:24:43 +0900 |
| Subject: [PATCH 0458/1795] mmc: tmio: move mmc_gpio_request_cd() before |
| mmc_add_host() |
| |
| Drivers do not need to call mmc_gpiod_request_cd_irq() explicitly |
| because mmc_start_host() calls it. To make it work, cd_gpio must |
| be set before mmc_add_host(). |
| |
| 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 cd82cd213bfa532ca368e4333ba6a0f14185ef9c) |
| 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 | 14 ++++++-------- |
| 1 file changed, 6 insertions(+), 8 deletions(-) |
| |
| diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c |
| index 8101ca2ca5a9..61eac261d3de 100644 |
| --- a/drivers/mmc/host/tmio_mmc_core.c |
| +++ b/drivers/mmc/host/tmio_mmc_core.c |
| @@ -1205,6 +1205,12 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, |
| if (ret < 0) |
| return ret; |
| |
| + if (pdata->flags & TMIO_MMC_USE_GPIO_CD) { |
| + ret = mmc_gpio_request_cd(mmc, pdata->cd_gpio, 0); |
| + if (ret) |
| + return ret; |
| + } |
| + |
| mmc->caps |= MMC_CAP_4_BIT_DATA | pdata->capabilities; |
| mmc->caps2 |= pdata->capabilities2; |
| mmc->max_segs = pdata->max_segs ? : 32; |
| @@ -1300,14 +1306,6 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, |
| |
| dev_pm_qos_expose_latency_limit(&pdev->dev, 100); |
| |
| - if (pdata->flags & TMIO_MMC_USE_GPIO_CD) { |
| - ret = mmc_gpio_request_cd(mmc, pdata->cd_gpio, 0); |
| - if (ret) |
| - goto remove_host; |
| - |
| - mmc_gpiod_request_cd_irq(mmc); |
| - } |
| - |
| return 0; |
| |
| remove_host: |
| -- |
| 2.19.0 |
| |
