openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mmc: pwrseq_simple: Make reset-gpios optional to match doc 

The DT binding doc says reset-gpios is an optional property but the code
currently bails out if it is omitted.

This is a regression since it breaks previously working device trees.
Fix it by restoring the original documented behaviour.

Fixes: ce03727586 ("mmc: pwrseq_simple: use GPIO descriptors array API")
Tested-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Martin Fuzzey <mfuzzey@parkeon.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Martin Fuzzey 2016-01-20 16:08:03 +01:00 committed by Ulf Hansson
parent 07cbeea541
commit 64a67d4762
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/mmc/core/pwrseq_simple.c
View File

@ -29,15 +29,18 @@ struct mmc_pwrseq_simple {
static void mmc_pwrseq_simple_set_gpios_value(struct mmc_pwrseq_simple *pwrseq, static void mmc_pwrseq_simple_set_gpios_value(struct mmc_pwrseq_simple *pwrseq,
int value) int value)
{ {
int i;
struct gpio_descs *reset_gpios = pwrseq->reset_gpios; struct gpio_descs *reset_gpios = pwrseq->reset_gpios;
int values[reset_gpios->ndescs];
for (i = 0; i < reset_gpios->ndescs; i++) if (!IS_ERR(reset_gpios)) {
values[i] = value; int i;
int values[reset_gpios->ndescs];
gpiod_set_array_value_cansleep(reset_gpios->ndescs, reset_gpios->desc, for (i = 0; i < reset_gpios->ndescs; i++)
values); values[i] = value;
gpiod_set_array_value_cansleep(
reset_gpios->ndescs, reset_gpios->desc, values);
}
} }
static void mmc_pwrseq_simple_pre_power_on(struct mmc_host *host) static void mmc_pwrseq_simple_pre_power_on(struct mmc_host *host)
@ -79,7 +82,8 @@ static void mmc_pwrseq_simple_free(struct mmc_host *host)
struct mmc_pwrseq_simple *pwrseq = container_of(host->pwrseq, struct mmc_pwrseq_simple *pwrseq = container_of(host->pwrseq,
struct mmc_pwrseq_simple, pwrseq); struct mmc_pwrseq_simple, pwrseq);
gpiod_put_array(pwrseq->reset_gpios); if (!IS_ERR(pwrseq->reset_gpios))
gpiod_put_array(pwrseq->reset_gpios);
if (!IS_ERR(pwrseq->ext_clk)) if (!IS_ERR(pwrseq->ext_clk))
clk_put(pwrseq->ext_clk); clk_put(pwrseq->ext_clk);
@ -112,7 +116,9 @@ struct mmc_pwrseq *mmc_pwrseq_simple_alloc(struct mmc_host *host,
} }
pwrseq->reset_gpios = gpiod_get_array(dev, "reset", GPIOD_OUT_HIGH); pwrseq->reset_gpios = gpiod_get_array(dev, "reset", GPIOD_OUT_HIGH);
if (IS_ERR(pwrseq->reset_gpios)) { if (IS_ERR(pwrseq->reset_gpios) &&
PTR_ERR(pwrseq->reset_gpios) != -ENOENT &&
PTR_ERR(pwrseq->reset_gpios) != -ENOSYS) {
ret = PTR_ERR(pwrseq->reset_gpios); ret = PTR_ERR(pwrseq->reset_gpios);
goto clk_put; goto clk_put;
} }