diff options
| author | Mark Brown <broonie@kernel.org> | 2019-03-04 15:32:43 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-03-04 15:32:43 +0000 |
| commit | 88f268a5bcc3b0683e6fbaf9973702e5329fc1e3 (patch) | |
| tree | a64bf49e575ece017359ba5ac89fbc52efd81f2a /include/linux/mfd | |
| parent | c364098fe8745b08a491fb43de785806ca91ba5e (diff) | |
| parent | e5680c4de3eb3ea5538d11733a91ccef19badd69 (diff) | |
| download | lwn-88f268a5bcc3b0683e6fbaf9973702e5329fc1e3.tar.gz lwn-88f268a5bcc3b0683e6fbaf9973702e5329fc1e3.zip | |
Merge branch 'regulator-5.1' into regulator-next
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/tps65218.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mfd/tps65218.h b/include/linux/mfd/tps65218.h index c204d9a79436..45cdcd0fee53 100644 --- a/include/linux/mfd/tps65218.h +++ b/include/linux/mfd/tps65218.h @@ -208,6 +208,7 @@ enum tps65218_regulator_id { /* LDOs */ TPS65218_LDO_1, /* LS's */ + TPS65218_LS_2, TPS65218_LS_3, }; @@ -218,7 +219,7 @@ enum tps65218_regulator_id { /* Number of LDO voltage regulators available */ #define TPS65218_NUM_LDO 1 /* Number of total LS current regulators available */ -#define TPS65218_NUM_LS 1 +#define TPS65218_NUM_LS 2 /* Number of total regulators available */ #define TPS65218_NUM_REGULATOR (TPS65218_NUM_DCDC + TPS65218_NUM_LDO \ + TPS65218_NUM_LS) |