Commit 628e0594 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v6.8-rc5' of... 

Merge tag 'regulator-fix-v6.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "Two small fixes, one small update for the max5970 driver bringing the
  driver and DT binding documentation into sync plus a missed update to
  the patterns in MAINTAINERS after a DT binding YAML conversion"

* tag 'regulator-fix-v6.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: max5970: Fix regulator child node name
  MAINTAINERS: repair entry for MICROCHIP MCP16502 PMIC DRIVER
parents e326df53 e5d40e9a

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -14380,7 +14380,7 @@ MICROCHIP MCP16502 PMIC DRIVER 
M:	Claudiu Beznea <claudiu.beznea@tuxon.dev>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Supported

F:	Documentation/devicetree/bindings/regulator/mcp16502-regulator.txt

F:	Documentation/devicetree/bindings/regulator/microchip,mcp16502.yaml

F:	drivers/regulator/mcp16502.c









MICROCHIP MCP3564 ADC DRIVER
































drivers/regulator/max5970-regulator.c



+4
−4






























Original line number
Diff line number
Diff line







@@ -29,8 +29,8 @@ struct max5970_regulator {







};



















enum max597x_regulator_id {









	MAX597X_SW0,









	MAX597X_SW1,









	MAX597X_sw0,









	MAX597X_sw1,









};



















static int max5970_read_adc(struct regmap *regmap, int reg, long *val)








@@ -378,8 +378,8 @@ static int max597x_dt_parse(struct device_node *np,







}



















static const struct regulator_desc regulators[] = {









	MAX597X_SWITCH(SW0, MAX5970_REG_CHXEN, 0, "vss1"),









	MAX597X_SWITCH(SW1, MAX5970_REG_CHXEN, 1, "vss2"),









	MAX597X_SWITCH(sw0, MAX5970_REG_CHXEN, 0, "vss1"),









	MAX597X_SWITCH(sw1, MAX5970_REG_CHXEN, 1, "vss2"),









};



















static int max597x_regmap_read_clear(struct regmap *map, unsigned int reg,