diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-15 17:59:12 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-15 17:59:12 -0700 |
commit | 584aeccc0b717f447505cc738d8c2f292d9d1a66 (patch) | |
tree | d4356481475213ba8d374ede187c27a17b16354a /drivers/regulator/max8952.c | |
parent | 25617a5c4503b20d2edcc75804169960e7c0d88e (diff) | |
parent | ef0b29e744965e8abc14260503a559366219035c (diff) |
Merge tag 'regulator-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator updates from Mark Brown:
"This s a very quiet release for the regulator API, we have a few new
devices (most of which are just ID updates) and one new fairly
specialist core feature for use in interrupt context.
- An API allowing lockless enable/disable for regulators acquired in
exclusive mode, for use in interrupt contexts
- A rewrite of the MedaTek DVFSRC regulator driver which apparently
never worked
- Support for Mediaktek MT6312, Qualcomm QCA6390 and WCN7850, Renesas
RZ/G2L USB VBUS regulator and ST Microelectronics STM32MP13"
* tag 'regulator-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (26 commits)
regulator: dt-bindings: pca9450: Make interrupt optional
regulator: pca9450: Make IRQ optional
dt-bindings: regulator: sprd,sc2731-regulator: convert to YAML
regulator: max77857: Constify struct regmap_config
regulator: da9121: Constify struct regmap_config
dt-bindings: regulator: ti,tps65132: document VIN supply
dt-bindings: mfd: twl: Fix example
regulator: Add Renesas RZ/G2L USB VBUS regulator driver
regulator: core: Add helper for allow HW access to enable/disable regulator
regulator: Add bindings for MediaTek DVFSRC Regulators
regulator: Add refactored mtk-dvfsrc-regulator driver
regulator: Remove mtk-dvfsrc-regulator.c
regulator: userspace-consumer: quiet device deferral
regulator: dt-bindings: mt6315: Document MT6319 PMIC
regulator: add missing MODULE_DESCRIPTION() macro
dt-bindings: regulator: twl-regulator: convert to yaml
regulator: dt-bindings: describe the PMU module of the WCN7850 package
regulator: dt-bindings: describe the PMU module of the QCA6390 package
regulator: dt-bindings: rtq2208: Add specified fixed LDO VOUT property
regulator: rtq2208: Add fixed LDO VOUT property and check that matches the constraints
...
Diffstat (limited to 'drivers/regulator/max8952.c')
-rw-r--r-- | drivers/regulator/max8952.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/max8952.c b/drivers/regulator/max8952.c index 0b0b841d214a..1f94315bfb02 100644 --- a/drivers/regulator/max8952.c +++ b/drivers/regulator/max8952.c @@ -307,8 +307,8 @@ static int max8952_pmic_probe(struct i2c_client *client) } static const struct i2c_device_id max8952_ids[] = { - { "max8952", 0 }, - { }, + { "max8952" }, + { } }; MODULE_DEVICE_TABLE(i2c, max8952_ids); |