diff options
| author |   Mark Brown <broonie@kernel.org> | 2018-09-28 15:07:30 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-09-28 15:07:30 +0100 |
| commit | 5451521409ce1c04d56c03854008fe8861893b05 (patch) | |
| tree | 8d8ee36c9021cd511fdf2f0416664d05b5ec406d /include/linux/mfd/da9063/pdata.h | |
| parent | regulator: da905{2,5}: Remove unnecessary array check (diff) | |
| parent | regulator: bd718xx: rename bd71837 to 718xx (diff) | |
| download | linux-dev-5451521409ce1c04d56c03854008fe8861893b05.tar.xz linux-dev-5451521409ce1c04d56c03854008fe8861893b05.zip | |
Merge tag 'bd71847-support' into regulator-4.20
regulator/mfd: Support for the ROHM BD71847
This adds support for the BD71847 which touches both MFD and regulator.
There's a few other bits and pieces included as some dependency patches
had already been applied so would've required rebasing.
Diffstat (limited to 'include/linux/mfd/da9063/pdata.h')
| -rw-r--r-- | include/linux/mfd/da9063/pdata.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/include/linux/mfd/da9063/pdata.h b/include/linux/mfd/da9063/pdata.h index 8a125701ef7b..50bed4f89c1a 100644 --- a/include/linux/mfd/da9063/pdata.h +++ b/include/linux/mfd/da9063/pdata.h @@ -21,7 +21,7 @@ /* * Regulator configuration */ -/* DA9063 regulator IDs */ +/* DA9063 and DA9063L regulator IDs */ enum { /* BUCKs */ DA9063_ID_BCORE1, @@ -37,18 +37,20 @@ enum { DA9063_ID_BMEM_BIO_MERGED, /* When two BUCKs are merged, they cannot be reused separately */ - /* LDOs */ + /* LDOs on both DA9063 and DA9063L */ + DA9063_ID_LDO3, + DA9063_ID_LDO7, + DA9063_ID_LDO8, + DA9063_ID_LDO9, + DA9063_ID_LDO11, + + /* DA9063-only LDOs */ DA9063_ID_LDO1, DA9063_ID_LDO2, - DA9063_ID_LDO3, DA9063_ID_LDO4, DA9063_ID_LDO5, DA9063_ID_LDO6, - DA9063_ID_LDO7, - DA9063_ID_LDO8, - DA9063_ID_LDO9, DA9063_ID_LDO10, - DA9063_ID_LDO11, }; /* Regulators platform data */ |