regulator: stw481x-vmmc: fix ages old enable error

commit 295070e9aa015abb9b92cccfbb1e43954e938133 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/regulator/stw481x-vmmc.c b/drivers/regulator/stw481x-vmmc.c
index 7d2ae3e9e942f26f302f526450487213da2cc44d..342f5da799758e0d054ef2aaa64c9ff1c566365e 100644 (file)
--- 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,
        .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,
 };
        .vsel_reg = STW_CONF1,
        .vsel_mask = STW_CONF1_VMMC_MASK,
 };