diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-11-12 15:22:38 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-11-13 09:22:37 +0000 |
| commit | 295070e9aa015abb9b92cccfbb1e43954e938133 (patch) | |
| tree | d0a08e7ce280bc877e22424437dbe59fa1857d9a /drivers/regulator/stw481x-vmmc.c | |
| parent | 1001354ca34179f3db924eb66672442a173147dc (diff) | |
| download | linux-stable-295070e9aa015abb9b92cccfbb1e43954e938133.tar.gz linux-stable-295070e9aa015abb9b92cccfbb1e43954e938133.tar.bz2 linux-stable-295070e9aa015abb9b92cccfbb1e43954e938133.zip | |
regulator: stw481x-vmmc: fix ages old enable error
The regulator has never been properly enabled, it has been
dormant all the time. It's strange that MMC was working
at all, but it likely worked by the signals going through
the levelshifter and reaching the card anyways.
Fixes: 3615a34ea1a6 ("regulator: add STw481x VMMC driver")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/regulator/stw481x-vmmc.c')
| -rw-r--r-- | drivers/regulator/stw481x-vmmc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/regulator/stw481x-vmmc.c b/drivers/regulator/stw481x-vmmc.c index 7d2ae3e9e942..342f5da79975 100644 --- a/drivers/regulator/stw481x-vmmc.c +++ b/drivers/regulator/stw481x-vmmc.c @@ -47,7 +47,8 @@ static struct regulator_desc vmmc_regulator = { .volt_table = stw481x_vmmc_voltages, .enable_time = 200, /* FIXME: look this up */ .enable_reg = STW_CONF1, - .enable_mask = STW_CONF1_PDN_VMMC, + .enable_mask = STW_CONF1_PDN_VMMC | STW_CONF1_MMC_LS_STATUS, + .enable_val = STW_CONF1_PDN_VMMC, .vsel_reg = STW_CONF1, .vsel_mask = STW_CONF1_VMMC_MASK, }; |