Commit f43e6ba0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v6.17-rc2' of... 

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
parents f70e1e79 11cd7a5c

Documentation/devicetree/bindings/regulator/infineon,ir38060.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Infineon Buck Regulators with PMBUS interfaces



maintainers:

  - Not Me.

  - Guenter Roeck <linux@roeck-us.net>



allOf:

  - $ref: regulator.yaml#

drivers/regulator/pca9450-regulator.c

+5 −8
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ struct pca9450 { 
	struct device *dev;

	struct regmap *regmap;

	struct gpio_desc *sd_vsel_gpio;

	struct notifier_block restart_nb;

	enum pca9450_chip_type type;

	unsigned int rcnt;

	int irq;
@@ -1100,10 +1099,9 @@ static irqreturn_t pca9450_irq_handler(int irq, void *data) 
	return IRQ_HANDLED;

}



static int pca9450_i2c_restart_handler(struct notifier_block *nb,

				unsigned long action, void *data)

static int pca9450_i2c_restart_handler(struct sys_off_data *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);



	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 =

		of_property_read_bool(ldo5->dev.of_node, "nxp,sd-vsel-fixed-low");



	pca9450->restart_nb.notifier_call = pca9450_i2c_restart_handler;

	pca9450->restart_nb.priority = PCA9450_RESTART_HANDLER_PRIORITY;



	if (register_restart_handler(&pca9450->restart_nb))

	if (devm_register_sys_off_handler(&i2c->dev, SYS_OFF_MODE_RESTART,

					  PCA9450_RESTART_HANDLER_PRIORITY,

					  pca9450_i2c_restart_handler, pca9450))

		dev_warn(&i2c->dev, "Failed to register restart handler\n");



	dev_info(&i2c->dev, "%s probed.\n",

drivers/regulator/tps65219-regulator.c

+6 −6
Original line number Diff line number Diff line
@@ -454,9 +454,9 @@ static int tps65219_regulator_probe(struct platform_device *pdev) 
						  irq_type->irq_name,

						  irq_data);

		if (error)

			return dev_err_probe(tps->dev, PTR_ERR(rdev),

					     "Failed to request %s IRQ %d: %d\n",

					     irq_type->irq_name, irq, error);

			return dev_err_probe(tps->dev, error,

					     "Failed to request %s IRQ %d\n",

					     irq_type->irq_name, irq);

	}



	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_data);

		if (error)

			return dev_err_probe(tps->dev, PTR_ERR(rdev),

					     "Failed to request %s IRQ %d: %d\n",

					     irq_type->irq_name, irq, error);

			return dev_err_probe(tps->dev, error,

					     "Failed to request %s IRQ %d\n",

					     irq_type->irq_name, irq);

	}



	return 0;