diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-30 12:21:41 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-30 12:21:41 +1000 |
| commit | 124e5e25299bc85c4891a3f460e0c1642dd709b5 (patch) | |
| tree | e2c45f057b1f245d7513adc708b9f1f28beb32f2 /include/linux/mfd/palmas.h | |
| parent | d14a2b61db484aefd480ed197af4c2c2e231d87d (diff) | |
| parent | af7a73de20f9f7a2362be322bf1e7303e08632a7 (diff) | |
Merge remote-tracking branch 'regulator/for-next'
Diffstat (limited to 'include/linux/mfd/palmas.h')
| -rw-r--r-- | include/linux/mfd/palmas.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h index 5c9a1d44c125..6dec43826303 100644 --- a/include/linux/mfd/palmas.h +++ b/include/linux/mfd/palmas.h @@ -250,6 +250,7 @@ enum tps65917_regulators { TPS65917_REG_SMPS3, TPS65917_REG_SMPS4, TPS65917_REG_SMPS5, + TPS65917_REG_SMPS12, /* LDO regulators */ TPS65917_REG_LDO1, TPS65917_REG_LDO2, @@ -317,6 +318,7 @@ enum tps65917_external_requestor_id { TPS65917_EXTERNAL_REQSTR_ID_SMPS3, TPS65917_EXTERNAL_REQSTR_ID_SMPS4, TPS65917_EXTERNAL_REQSTR_ID_SMPS5, + TPS65917_EXTERNAL_REQSTR_ID_SMPS12, TPS65917_EXTERNAL_REQSTR_ID_LDO1, TPS65917_EXTERNAL_REQSTR_ID_LDO2, TPS65917_EXTERNAL_REQSTR_ID_LDO3, |