]> git.hungrycats.org Git - linux/commitdiff
regulator: stw481x-vmmc: fix ages old enable error
authorLinus Walleij <linus.walleij@linaro.org>
Sat, 12 Nov 2016 14:22:38 +0000 (15:22 +0100)
committerSasha Levin <alexander.levin@verizon.com>
Fri, 13 Jan 2017 23:00:11 +0000 (18:00 -0500)
[ Upstream commit 295070e9aa015abb9b92cccfbb1e43954e938133 ]

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
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
drivers/regulator/stw481x-vmmc.c

index a7e152696a022f4ed20b2175fb2689e21072e3cc..f140b42956a47f5952cc62a98a0d3615e44508f7 100644 (file)
@@ -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,
 };