diff options
| author | Dave Gerlach <d-gerlach@ti.com> | 2018-02-15 22:17:05 -0600 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2018-05-16 09:21:48 +0100 |
| commit | efc9b2048c7f6bb52f70cc84b8b8b8dcc685a0d6 (patch) | |
| tree | 104ffc9b88537d6aca7df17898e2e49e2b85894c /include | |
| parent | 408d1d570a63394785221ffa4131ee85b53df7b1 (diff) | |
| download | linux-stable-efc9b2048c7f6bb52f70cc84b8b8b8dcc685a0d6.tar.gz linux-stable-efc9b2048c7f6bb52f70cc84b8b8b8dcc685a0d6.tar.bz2 linux-stable-efc9b2048c7f6bb52f70cc84b8b8b8dcc685a0d6.zip | |
mfd: tps65218: Reorder tps65218_regulator_id enum
Commit 2dc4940360d4 ("regulator: tps65218: Remove all the compatibles")
changes the probe function of drivers/regulator/tps65218-regulator.c so
that it iterates through all available regulators and assumes that the
regulator IDs are sequential and match the order present in the enum
tps65218_regulator_id. However, for some reason the much older commit
c0ea88b890d6 ("regulator: tps65218: add support for LS3 current
regulator") updated all arrays with LS3 at the end but added it second
to last for the enum.
Because of this long standing mismatch in order between the
tps65218_regulator_id enum and the regulator_desc array in the tps65218
regulator driver, the new probe function causes the strobe values to be
associated with the wrong regulator ID. This causes LDO1 to fail to
suspend in tps65218_pmic_set_suspend_disable due to not having anything
probes for its strobe value. Fix the order in the enum so the probe
function works as the update intended.
Fixes: 2dc4940360d4 ("regulator: tps65218: Remove all the compatibles")
Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mfd/tps65218.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mfd/tps65218.h b/include/linux/mfd/tps65218.h index f069c518c0ed..c204d9a79436 100644 --- a/include/linux/mfd/tps65218.h +++ b/include/linux/mfd/tps65218.h @@ -205,10 +205,10 @@ enum tps65218_regulator_id { TPS65218_DCDC_4, TPS65218_DCDC_5, TPS65218_DCDC_6, - /* LS's */ - TPS65218_LS_3, /* LDOs */ TPS65218_LDO_1, + /* LS's */ + TPS65218_LS_3, }; #define TPS65218_MAX_REG_ID TPS65218_LDO_1 |