iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mmc: davinci: request gpios using gpio descriptors

Browse Source 
Request card detect and write protect gpios using the provided API
by mmc core.

If a gpio is provided for card detect, we don't need to poll.
So only use polling when a gpio is not provided.

Once all pdata users register the gpios using gpio descriptors,
we could remove the platform callbacks.

Signed-off-by: Axel Haslam <ahaslam@baylibre.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: David Lechner <david@lechnology.com>
This commit is contained in:
ahaslam@baylibre.com 2016-11-15 17:28:22 +01:00 committed by Ulf Hansson
parent c8301e798f
commit 6e628dad65
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/mmc/host/davinci_mmc.c
View File

@ -1167,6 +1167,7 @@ static int mmc_davinci_parse_pdata(struct mmc_host *mmc)
struct platform_device *pdev = to_platform_device(mmc->parent); struct platform_device *pdev = to_platform_device(mmc->parent);
struct davinci_mmc_config *pdata = pdev->dev.platform_data; struct davinci_mmc_config *pdata = pdev->dev.platform_data;
struct mmc_davinci_host *host; struct mmc_davinci_host *host;
int ret;
if (!pdata) if (!pdata)
return -EINVAL; return -EINVAL;
@ -1184,7 +1185,6 @@ static int mmc_davinci_parse_pdata(struct mmc_host *mmc)
if (pdata && (pdata->wires == 8)) if (pdata && (pdata->wires == 8))
mmc->caps |= (MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA); mmc->caps |= (MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA);
mmc->caps |= MMC_CAP_NEEDS_POLL;
mmc->f_min = 312500; mmc->f_min = 312500;
mmc->f_max = 25000000; mmc->f_max = 25000000;
if (pdata && pdata->max_freq) if (pdata && pdata->max_freq)
@ -1192,6 +1192,17 @@ static int mmc_davinci_parse_pdata(struct mmc_host *mmc)
if (pdata && pdata->caps) if (pdata && pdata->caps)
mmc->caps |= pdata->caps; mmc->caps |= pdata->caps;
/* Register a cd gpio, if there is not one, enable polling */
ret = mmc_gpiod_request_cd(mmc, "cd", 0, false, 0, NULL);
if (ret == -EPROBE_DEFER)
return ret;
else if (ret)
mmc->caps |= MMC_CAP_NEEDS_POLL;
ret = mmc_gpiod_request_ro(mmc, "wp", 0, false, 0, NULL);
if (ret == -EPROBE_DEFER)
return ret;
return 0; return 0;
} }