iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2024-02-28 11:10:27 -08:00
parent e326df53af e5d40e9afd
commit 628e0594fd
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@@ -14380,7 +14380,7 @@ MICROCHIP MCP16502 PMIC DRIVER
M: Claudiu Beznea <claudiu.beznea@tuxon.dev> M: Claudiu Beznea <claudiu.beznea@tuxon.dev>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Supported S: Supported
F: Documentation/devicetree/bindings/regulator/mcp16502-regulator.txt F: Documentation/devicetree/bindings/regulator/microchip,mcp16502.yaml
F: drivers/regulator/mcp16502.c F: drivers/regulator/mcp16502.c
MICROCHIP MCP3564 ADC DRIVER MICROCHIP MCP3564 ADC DRIVER

8
drivers/regulator/max5970-regulator.c
View File

@@ -29,8 +29,8 @@ struct max5970_regulator {
}; };
enum max597x_regulator_id { enum max597x_regulator_id {
MAX597X_SW0, MAX597X_sw0,
MAX597X_SW1, MAX597X_sw1,
}; };
static int max5970_read_adc(struct regmap *regmap, int reg, long *val) 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[] = { static const struct regulator_desc regulators[] = {
MAX597X_SWITCH(SW0, MAX5970_REG_CHXEN, 0, "vss1"), MAX597X_SWITCH(sw0, MAX5970_REG_CHXEN, 0, "vss1"),
MAX597X_SWITCH(SW1, MAX5970_REG_CHXEN, 1, "vss2"), MAX597X_SWITCH(sw1, MAX5970_REG_CHXEN, 1, "vss2"),
}; };
static int max597x_regmap_read_clear(struct regmap *map, unsigned int reg, static int max597x_regmap_read_clear(struct regmap *map, unsigned int reg,