diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-01-19 12:03:35 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-01-19 12:03:35 +0800 |
| commit | d28996d022a87e81bd6d4bedd5990b68d7e4d567 (patch) | |
| tree | 8b7a18ca2701b77a626a0e3c155d5e63a7fa99a6 /drivers/regulator/stw481x-vmmc.c | |
| parent | ec54c473486f2addc56e99c1191e4975123930d7 (diff) | |
| parent | 108df9c204f549150c7e1e3262ffd19bd624269e (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-rtlsk-v3.18-17.02-rt
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 a7e152696a02..f140b42956a4 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, }; |