torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

regulator: Fixes for v6.17

Browse Source 
A couple of fairly minor device specific fixes that came in over the
 past week or so, plus the addition of an actual maintainer for the
 IR38060.
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmincPUACgkQJNaLcl1U
 h9CCbgf/dhq9uXBrSAEi/bAxMlr0sRPSeqZypnnkgPm7rFG2Ox7B2sZLa03Un8hz
 Kus6sUupyX/SHBTNIV+fgO6EXgeoOwXtTEvqdRy9TuA0EQMDM3QWTCkshF2wgMG5
 o73ThEaWfLw1kju3NUKgV1szcgQ7VB8qHqlJwor3htPgSTHDq+Rk22lLYJ7oMVNo
 E1D075tyJb0hyBlPqVmard5nItWSHYi3SRvATu4to0MLU6iU970NWtzOVzCKzM+i
 2TDt84QWqhemvArz08AKTpCYk9azxHbPSlS8UH5UV8WyX4MIfWAUdk5XworIpCPk
 0d2jLevYR7BNO5uX1hZD7gqLno6kAg==
 =w1wH
 -----END PGP SIGNATURE-----

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

Pull regulator fixes from Mark Brown:
 "A couple of fairly minor device specific fixes that came in over the
  past week or so, plus the addition of an actual maintainer for the
  IR38060"

* tag 'regulator-fix-v6.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: tps65219: regulator: tps65219: Fix error codes in probe()
  regulator: pca9450: Use devm_register_sys_off_handler
  regulator: dt-bindings: infineon,ir38060: Add Guenter as maintainer from IBM
This commit is contained in:
Linus Torvalds 2025-08-21 16:26:18 -04:00
commit f43e6ba0b4
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/devicetree/bindings/regulator/infineon,ir38060.yaml
View File

@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Infineon Buck Regulators with PMBUS interfaces title: Infineon Buck Regulators with PMBUS interfaces
maintainers: maintainers:
- Not Me. - Guenter Roeck <linux@roeck-us.net>
allOf: allOf:
- $ref: regulator.yaml# - $ref: regulator.yaml#

13
drivers/regulator/pca9450-regulator.c
View File

@ -40,7 +40,6 @@ struct pca9450 {
struct device *dev; struct device *dev;
struct regmap *regmap; struct regmap *regmap;
struct gpio_desc *sd_vsel_gpio; struct gpio_desc *sd_vsel_gpio;
struct notifier_block restart_nb;
enum pca9450_chip_type type; enum pca9450_chip_type type;
unsigned int rcnt; unsigned int rcnt;
int irq; int irq;
@ -1100,10 +1099,9 @@ static irqreturn_t pca9450_irq_handler(int irq, void *data)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int pca9450_i2c_restart_handler(struct notifier_block *nb, static int pca9450_i2c_restart_handler(struct sys_off_data *data)
unsigned long action, void *data)
{ {
struct pca9450 *pca9450 = container_of(nb, struct pca9450, restart_nb); struct pca9450 *pca9450 = data->cb_data;
struct i2c_client *i2c = container_of(pca9450->dev, struct i2c_client, dev); struct i2c_client *i2c = container_of(pca9450->dev, struct i2c_client, dev);
dev_dbg(&i2c->dev, "Restarting device..\n"); dev_dbg(&i2c->dev, "Restarting device..\n");
@ -1261,10 +1259,9 @@ static int pca9450_i2c_probe(struct i2c_client *i2c)
pca9450->sd_vsel_fixed_low = pca9450->sd_vsel_fixed_low =
of_property_read_bool(ldo5->dev.of_node, "nxp,sd-vsel-fixed-low"); of_property_read_bool(ldo5->dev.of_node, "nxp,sd-vsel-fixed-low");
pca9450->restart_nb.notifier_call = pca9450_i2c_restart_handler; if (devm_register_sys_off_handler(&i2c->dev, SYS_OFF_MODE_RESTART,
pca9450->restart_nb.priority = PCA9450_RESTART_HANDLER_PRIORITY; PCA9450_RESTART_HANDLER_PRIORITY,
pca9450_i2c_restart_handler, pca9450))
if (register_restart_handler(&pca9450->restart_nb))
dev_warn(&i2c->dev, "Failed to register restart handler\n"); dev_warn(&i2c->dev, "Failed to register restart handler\n");
dev_info(&i2c->dev, "%s probed.\n", dev_info(&i2c->dev, "%s probed.\n",

12
drivers/regulator/tps65219-regulator.c
View File

@ -454,9 +454,9 @@ static int tps65219_regulator_probe(struct platform_device *pdev)
irq_type->irq_name, irq_type->irq_name,
irq_data); irq_data);
if (error) if (error)
return dev_err_probe(tps->dev, PTR_ERR(rdev), return dev_err_probe(tps->dev, error,
"Failed to request %s IRQ %d: %d\n", "Failed to request %s IRQ %d\n",
irq_type->irq_name, irq, error); irq_type->irq_name, irq);
} }
for (i = 0; i < pmic->dev_irq_size; ++i) { for (i = 0; i < pmic->dev_irq_size; ++i) {
@ -477,9 +477,9 @@ static int tps65219_regulator_probe(struct platform_device *pdev)
irq_type->irq_name, irq_type->irq_name,
irq_data); irq_data);
if (error) if (error)
return dev_err_probe(tps->dev, PTR_ERR(rdev), return dev_err_probe(tps->dev, error,
"Failed to request %s IRQ %d: %d\n", "Failed to request %s IRQ %d\n",
irq_type->irq_name, irq, error); irq_type->irq_name, irq);
} }
return 0; return 0;