Commit 9a921a6f authored Apr 17, 2022 by Linus Torvalds

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

Pull power supply fixes from Sebastian Reichel:

 - Fix a regression with battery data failing to load from DT

* tag 'for-v5.18-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
  power: supply: Reset err after not finding static battery
  power: supply: samsung-sdi-battery: Add missing charge restart voltages

parents bd0c7d75 581045ed

drivers/power/supply/power_supply_core.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -604,6 +604,12 @@ int power_supply_get_battery_info(struct power_supply *psy,
		err = samsung_sdi_battery_get_info(&psy->dev, value, &info);
		if (!err)
		goto out_ret_pointer;
		else if (err == -ENODEV)
		/*
		* Device does not have a static battery.
		* Proceed to look for a simple battery.
		*/
		err = 0;

		if (strcmp("simple-battery", value)) {
		err = -ENODEV;

drivers/power/supply/samsung-sdi-battery.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -824,6 +824,7 @@ static struct samsung_sdi_battery samsung_sdi_batteries[] = {
		.constant_charge_current_max_ua = 900000,
		.constant_charge_voltage_max_uv = 4200000,
		.charge_term_current_ua = 200000,
		.charge_restart_voltage_uv = 4170000,
		.maintenance_charge = samsung_maint_charge_table,
		.maintenance_charge_size = ARRAY_SIZE(samsung_maint_charge_table),
		.alert_low_temp_charge_current_ua = 300000,
		@@ -867,6 +868,7 @@ static struct samsung_sdi_battery samsung_sdi_batteries[] = {
		.constant_charge_current_max_ua = 1500000,
		.constant_charge_voltage_max_uv = 4350000,
		.charge_term_current_ua = 120000,
		.charge_restart_voltage_uv = 4300000,
		.maintenance_charge = samsung_maint_charge_table,
		.maintenance_charge_size = ARRAY_SIZE(samsung_maint_charge_table),
		.alert_low_temp_charge_current_ua = 300000,