diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-11-01 06:33:21 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-11-01 06:33:21 +0300 |
commit | 9d6c80f8054f75326939b947185ec47ba3755d42 (patch) | |
tree | 4fe0a1b1bcdb6ffc48dbb20b82f7347792143b81 /include | |
parent | 5cbff4b2d9e2a59f4096af8b8f967e2b30f025f2 (diff) | |
parent | 3e0569ff812675e896cbdcbbaec10c99b544b947 (diff) | |
download | linux-9d6c80f8054f75326939b947185ec47ba3755d42.tar.xz |
Merge tag 'regulator-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator updates from Mark Brown:
"This has been a fairly quiet release for the regulator API, the
changes are dominated by some new drivers and a quite large set of
cleanups and filling in the blanks of features for the existing MT6358
driver.
- Cleanups and additional features for the Mediatek MT6358 driver
- Under voltage detection in the fixed regulator
- Support for Maxim MAX77503, Mediatek MT6366, Qualcomm PM8909,
PM8919, PMA8048 and PMC8380"
* tag 'regulator-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (45 commits)
regulator (max5970): Remove duplicate line
regulator (max5970): Add hwmon support
regulator: qcom-rpmh: Fix smps4 regulator for pm8550ve
regulator: qcom,rpmh: Add PMC8380 compatible
regulator: qcom-rpmh: Add regulators support for PMC8380
regulator: fixed: add support for under-voltage IRQ
regulator: dt-bindings: fixed-regulator: Add under-voltage interrupt support
dt-bindings: regulator: dlg,da9210: Convert to json-schema
regulator: dt-bindings: Add ADI MAX77503 support
regulator: max77503: Add ADI MAX77503 support
regulator: Use device_get_match_data()
regulator: da9121: Use i2c_get_match_data()
regulator: Drop unnecessary of_match_device() calls
regulator: da9063: Annotate struct da9063_regulators with __counted_by
regulator: da9062: Annotate struct da9062_regulators with __counted_by
regulator: mt6358: Add supply names for MT6366 regulators
regulator: mt6358: Add missing regulators for MT6366
regulator: mt6358: Make MT6366 vcn18 LDO configurable
regulator: mt6358: fix and drop type prefix in MT6366 regulator node names
regulator: mt6358: Add supply names for MT6358 regulators
...
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/mfd/mt6358/registers.h | 23 | ||||
-rw-r--r-- | include/linux/regulator/mt6358-regulator.h | 3 |
2 files changed, 26 insertions, 0 deletions
diff --git a/include/linux/mfd/mt6358/registers.h b/include/linux/mfd/mt6358/registers.h index 3d33517f178c..d83e87298ac4 100644 --- a/include/linux/mfd/mt6358/registers.h +++ b/include/linux/mfd/mt6358/registers.h @@ -262,6 +262,12 @@ #define MT6358_LDO_VBIF28_CON3 0x1db0 #define MT6358_VCAMA1_ANA_CON0 0x1e08 #define MT6358_VCAMA2_ANA_CON0 0x1e0c +#define MT6358_VFE28_ANA_CON0 0x1e10 +#define MT6358_VCN28_ANA_CON0 0x1e14 +#define MT6358_VBIF28_ANA_CON0 0x1e18 +#define MT6358_VAUD28_ANA_CON0 0x1e1c +#define MT6358_VAUX18_ANA_CON0 0x1e20 +#define MT6358_VXO22_ANA_CON0 0x1e24 #define MT6358_VCN33_ANA_CON0 0x1e28 #define MT6358_VSIM1_ANA_CON0 0x1e2c #define MT6358_VSIM2_ANA_CON0 0x1e30 @@ -288,4 +294,21 @@ #define MT6358_AUD_TOP_INT_CON0 0x2228 #define MT6358_AUD_TOP_INT_STATUS0 0x2234 +/* + * MT6366 has no VCAM*, but has other regulators in its place. The names + * keep the MT6358 prefix for ease of use in the regulator driver. + */ +#define MT6358_LDO_VSRAM_CON5 0x1bf8 +#define MT6358_LDO_VM18_CON0 MT6358_LDO_VCAMA1_CON0 +#define MT6358_LDO_VM18_CON1 MT6358_LDO_VCAMA1_CON1 +#define MT6358_LDO_VM18_CON2 MT6358_LDO_VCAMA1_CON2 +#define MT6358_LDO_VMDDR_CON0 MT6358_LDO_VCAMA2_CON0 +#define MT6358_LDO_VMDDR_CON1 MT6358_LDO_VCAMA2_CON1 +#define MT6358_LDO_VMDDR_CON2 MT6358_LDO_VCAMA2_CON2 +#define MT6358_LDO_VSRAM_CORE_CON0 MT6358_LDO_VCAMD_CON0 +#define MT6358_LDO_VSRAM_CORE_DBG0 0x1cb6 +#define MT6358_LDO_VSRAM_CORE_DBG1 0x1cb8 +#define MT6358_VM18_ANA_CON0 MT6358_VCAMA1_ANA_CON0 +#define MT6358_VMDDR_ANA_CON0 MT6358_VCAMD_ANA_CON0 + #endif /* __MFD_MT6358_REGISTERS_H__ */ diff --git a/include/linux/regulator/mt6358-regulator.h b/include/linux/regulator/mt6358-regulator.h index c71a6a9fce7a..562386f9b80e 100644 --- a/include/linux/regulator/mt6358-regulator.h +++ b/include/linux/regulator/mt6358-regulator.h @@ -86,6 +86,9 @@ enum { MT6366_ID_VMC, MT6366_ID_VAUD28, MT6366_ID_VSIM2, + MT6366_ID_VM18, + MT6366_ID_VMDDR, + MT6366_ID_VSRAM_CORE, MT6366_ID_RG_MAX, }; |