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

Merge tag 'for-v6.4-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply 

Pull power supply fixes from Sebastian Reichel:

 - Fix power_supply_get_battery_info for devices without parent devices
   resulting in NULL pointer dereference

 - Fix desktop systems reporting to run on battery once a power-supply
   device with device scope appears (e.g. a HID keyboard with a battery)

 - Ratelimit debug print about driver not providing data

 - Fix race condition related to external_power_changed in multiple
   drivers (ab8500, axp288, bq25890, sc27xx, bq27xxx)

 - Fix LED trigger switching from blinking to solid-on when charging
   finishes

 - Fix multiple races in bq27xxx battery driver

 - mt6360: handle potential ENOMEM from devm_work_autocancel

 - sbs-charger: Fix SBS_CHARGER_STATUS_CHARGE_INHIBITED bit

 - rt9467: avoid passing 0 to dev_err_probe

* tag 'for-v6.4-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (21 commits)
  power: supply: Fix logic checking if system is running from battery
  power: supply: mt6360: add a check of devm_work_autocancel in mt6360_charger_probe
  power: supply: sbs-charger: Fix INHIBITED bit for Status reg
  power: supply: rt9467: Fix passing zero to 'dev_err_probe'
  power: supply: Ratelimit no data debug output
  power: supply: Fix power_supply_get_battery_info() if parent is NULL
  power: supply: bq24190: Call power_supply_changed() after updating input current
  power: supply: bq25890: Call power_supply_changed() after updating input current or voltage
  power: supply: bq27xxx: Use mod_delayed_work() instead of cancel() + schedule()
  power: supply: bq27xxx: After charger plug in/out wait 0.5s for things to stabilize
  power: supply: bq27xxx: Ensure power_supply_changed() is called on current sign changes
  power: supply: bq27xxx: Move bq27xxx_battery_update() down
  power: supply: bq27xxx: Add cache parameter to bq27xxx_battery_current_and_status()
  power: supply: bq27xxx: Fix poll_interval handling and races on remove
  power: supply: bq27xxx: Fix I2C IRQ race on remove
  power: supply: bq27xxx: Fix bq27xxx_battery_update() race condition
  power: supply: leds: Fix blink to LED on transition
  power: supply: sc27xx: Fix external_power_changed race
  power: supply: bq25890: Fix external_power_changed race
  power: supply: axp288_fuel_gauge: Fix external_power_changed race
  ...
parents 029c77f8 95339f40

drivers/power/supply/ab8500_btemp.c

+2 −4
Original line number Diff line number Diff line
@@ -624,10 +624,8 @@ static int ab8500_btemp_get_ext_psy_data(struct device *dev, void *data) 
 */

static void ab8500_btemp_external_power_changed(struct power_supply *psy)

{

	struct ab8500_btemp *di = power_supply_get_drvdata(psy);



	class_for_each_device(power_supply_class, NULL,

		di->btemp_psy, ab8500_btemp_get_ext_psy_data);

	class_for_each_device(power_supply_class, NULL, psy,

			      ab8500_btemp_get_ext_psy_data);

}



/* ab8500 btemp driver interrupts and their respective isr */

drivers/power/supply/ab8500_fg.c

+2 −4
Original line number Diff line number Diff line
@@ -2407,10 +2407,8 @@ static int ab8500_fg_init_hw_registers(struct ab8500_fg *di) 
 */

static void ab8500_fg_external_power_changed(struct power_supply *psy)

{

	struct ab8500_fg *di = power_supply_get_drvdata(psy);



	class_for_each_device(power_supply_class, NULL,

		di->fg_psy, ab8500_fg_get_ext_psy_data);

	class_for_each_device(power_supply_class, NULL, psy,

			      ab8500_fg_get_ext_psy_data);

}



/**

drivers/power/supply/axp288_fuel_gauge.c

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ static void fuel_gauge_external_power_changed(struct power_supply *psy) 
	mutex_lock(&info->lock);

	info->valid = 0; /* Force updating of the cached registers */

	mutex_unlock(&info->lock);

	power_supply_changed(info->bat);

	power_supply_changed(psy);

}



static struct power_supply_desc fuel_gauge_desc = {

drivers/power/supply/bq24190_charger.c

+1 −0
Original line number Diff line number Diff line
@@ -1262,6 +1262,7 @@ static void bq24190_input_current_limit_work(struct work_struct *work) 
	bq24190_charger_set_property(bdi->charger,

				     POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT,

				     &val);

	power_supply_changed(bdi->charger);

}



/* Sync the input-current-limit with our parent supply (if we have one) */

drivers/power/supply/bq25890_charger.c

+4 −1
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ static void bq25890_charger_external_power_changed(struct power_supply *psy) 
	if (bq->chip_version != BQ25892)

		return;



	ret = power_supply_get_property_from_supplier(bq->charger,

	ret = power_supply_get_property_from_supplier(psy,

						      POWER_SUPPLY_PROP_USB_TYPE,

						      &val);

	if (ret)
@@ -775,6 +775,7 @@ static void bq25890_charger_external_power_changed(struct power_supply *psy) 
	}



	bq25890_field_write(bq, F_IINLIM, input_current_limit);

	power_supply_changed(psy);

}



static int bq25890_get_chip_state(struct bq25890_device *bq,
@@ -1106,6 +1107,8 @@ static void bq25890_pump_express_work(struct work_struct *data) 
	dev_info(bq->dev, "Hi-voltage charging requested, input voltage is %d mV\n",

		 voltage);



	power_supply_changed(bq->charger);



	return;

error_print:

	bq25890_field_write(bq, F_PUMPX_EN, 0);