Skip to content

Commit 628e059

Browse files
committed
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
2 parents e326df5 + e5d40e9 commit 628e059

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14380,7 +14380,7 @@ MICROCHIP MCP16502 PMIC DRIVER
1438014380
M: Claudiu Beznea <[email protected]>
1438114381
L: [email protected] (moderated for non-subscribers)
1438214382
S: Supported
14383-
F: Documentation/devicetree/bindings/regulator/mcp16502-regulator.txt
14383+
F: Documentation/devicetree/bindings/regulator/microchip,mcp16502.yaml
1438414384
F: drivers/regulator/mcp16502.c
1438514385

1438614386
MICROCHIP MCP3564 ADC DRIVER

drivers/regulator/max5970-regulator.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ struct max5970_regulator {
2929
};
3030

3131
enum max597x_regulator_id {
32-
MAX597X_SW0,
33-
MAX597X_SW1,
32+
MAX597X_sw0,
33+
MAX597X_sw1,
3434
};
3535

3636
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,
378378
}
379379

380380
static const struct regulator_desc regulators[] = {
381-
MAX597X_SWITCH(SW0, MAX5970_REG_CHXEN, 0, "vss1"),
382-
MAX597X_SWITCH(SW1, MAX5970_REG_CHXEN, 1, "vss2"),
381+
MAX597X_SWITCH(sw0, MAX5970_REG_CHXEN, 0, "vss1"),
382+
MAX597X_SWITCH(sw1, MAX5970_REG_CHXEN, 1, "vss2"),
383383
};
384384

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

0 commit comments

Comments
 (0)