Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+8
+6
drivers/power/supply/power_supply_core.c
+6
drivers/power/supply/power_supply_core.c
···
604
604
err = samsung_sdi_battery_get_info(&psy->dev, value, &info);
605
605
if (!err)
606
606
goto out_ret_pointer;
607
+
else if (err == -ENODEV)
608
+
/*
609
+
* Device does not have a static battery.
610
+
* Proceed to look for a simple battery.
611
+
*/
612
+
err = 0;
607
613
608
614
if (strcmp("simple-battery", value)) {
609
615
err = -ENODEV;
+2
drivers/power/supply/samsung-sdi-battery.c
+2
drivers/power/supply/samsung-sdi-battery.c
···
824
824
.constant_charge_current_max_ua = 900000,
825
825
.constant_charge_voltage_max_uv = 4200000,
826
826
.charge_term_current_ua = 200000,
827
+
.charge_restart_voltage_uv = 4170000,
827
828
.maintenance_charge = samsung_maint_charge_table,
828
829
.maintenance_charge_size = ARRAY_SIZE(samsung_maint_charge_table),
829
830
.alert_low_temp_charge_current_ua = 300000,
···
868
867
.constant_charge_current_max_ua = 1500000,
869
868
.constant_charge_voltage_max_uv = 4350000,
870
869
.charge_term_current_ua = 120000,
870
+
.charge_restart_voltage_uv = 4300000,
871
871
.maintenance_charge = samsung_maint_charge_table,
872
872
.maintenance_charge_size = ARRAY_SIZE(samsung_maint_charge_table),
873
873
.alert_low_temp_charge_current_ua = 300000,