Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 619e17cf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull power supply and reset updates from Sebastian Reichel:
 "Core:
   - Ensure HWMON devices are registered with valid names
   - Fix device wakeup code

  Drivers:
   - bq25890_charger: Add BQ25895 support
   - axp288_fuel_gauge: Add Minix Neo Z83-4 to blacklist
   - sc27xx: improve battery calibration
   - misc small fixes all over drivers"

* tag 'for-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (24 commits)
  power: supply: cpcap-charger: Enable vbus boost voltage
  power: supply: sc27xx: Add POWER_SUPPLY_PROP_CALIBRATE attribute
  power: supply: sc27xx: Optimize the battery capacity calibration
  power: supply: sc27xx: Make sure the alarm capacity is larger than 0
  power: supply: sc27xx: Fix the the accuracy issue of coulomb calculation
  power: supply: sc27xx: Fix conditon to enable the FGU interrupt
  power: supply: sc27xx: Add POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN attribute
  power: supply: max77650: add MODULE_ALIAS()
  power: supply: isp1704: remove redundant assignment to variable ret
  power: supply: bq25890_charger: Add the BQ25895 part
  power: supply: sc27xx: Replace devm_add_action() followed by failure action with devm_add_action_or_reset()
  power: supply: sc27xx: Introduce local variable 'struct device *dev'
  power: reset: reboot-mode: Fix author email format
  power: supply: ab8500: remove set but not used variables 'vbup33_vrtcn' and 'bup_vch_range'
  power: supply: max17042_battery: Fix a typo in function names
  power: reset: gpio-restart: Fix typo when gpio reset is not found
  power: supply: Init device wakeup after device_add()
  power: supply: ab8500_charger: Mark expected switch fall-through
  power: supply: sbs-battery: only return health when battery present
  MAINTAINERS: N900: Remove isp1704_charger.h record
  ...
parents 57f1c3ca 7f737861

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -11511,7 +11511,6 @@ NOKIA N900 POWER SUPPLY DRIVERS 
R:	Pali Rohár <pali.rohar@gmail.com>

F:	include/linux/power/bq2415x_charger.h

F:	include/linux/power/bq27xxx_battery.h

F:	include/linux/power/isp1704_charger.h

F:	drivers/power/supply/bq2415x_charger.c

F:	drivers/power/supply/bq27xxx_battery.c

F:	drivers/power/supply/bq27xxx_battery_i2c.c

drivers/phy/motorola/phy-cpcap-usb.c

+5 −3
Original line number Diff line number Diff line
@@ -231,8 +231,9 @@ static void cpcap_usb_detect(struct work_struct *work) 
			goto out_err;



		error = regmap_update_bits(ddata->reg, CPCAP_REG_USBC3,

					   CPCAP_BIT_VBUSSTBY_EN,

					   CPCAP_BIT_VBUSSTBY_EN);

					   CPCAP_BIT_VBUSSTBY_EN |

					   CPCAP_BIT_VBUSEN_SPI,

					   CPCAP_BIT_VBUSEN_SPI);

		if (error)

			goto out_err;
@@ -240,7 +241,8 @@ static void cpcap_usb_detect(struct work_struct *work) 
	}



	error = regmap_update_bits(ddata->reg, CPCAP_REG_USBC3,

				   CPCAP_BIT_VBUSSTBY_EN, 0);

				   CPCAP_BIT_VBUSSTBY_EN |

				   CPCAP_BIT_VBUSEN_SPI, 0);

	if (error)

		goto out_err;

drivers/power/reset/gpio-restart.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static int gpio_restart_probe(struct platform_device *pdev) 
	gpio_restart->reset_gpio = devm_gpiod_get(&pdev->dev, NULL,

			open_source ? GPIOD_IN : GPIOD_OUT_LOW);

	if (IS_ERR(gpio_restart->reset_gpio)) {

		dev_err(&pdev->dev, "Could net get reset GPIO\n");

		dev_err(&pdev->dev, "Could not get reset GPIO\n");

		return PTR_ERR(gpio_restart->reset_gpio);

	}

drivers/power/reset/reboot-mode.c

+1 −1
Original line number Diff line number Diff line
@@ -190,6 +190,6 @@ void devm_reboot_mode_unregister(struct device *dev, 
}

EXPORT_SYMBOL_GPL(devm_reboot_mode_unregister);



MODULE_AUTHOR("Andy Yan <andy.yan@rock-chips.com");

MODULE_AUTHOR("Andy Yan <andy.yan@rock-chips.com>");

MODULE_DESCRIPTION("System reboot mode core library");

MODULE_LICENSE("GPL v2");

drivers/power/supply/ab8500_charger.c

+1 −8
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ static int ab8500_charger_max_usb_curr(struct ab8500_charger *di, 
						USB_CH_IP_CUR_LVL_1P5;

			break;

		}

		/* Else, fall through */

		/* else, fall through */

	case USB_STAT_HM_IDGND:

		dev_err(di->dev, "USB Type - Charging not allowed\n");

		di->max_usb_in_curr.usb_type_max = USB_CH_IP_CUR_LVL_0P05;
@@ -3011,7 +3011,6 @@ static int ab8500_charger_usb_get_property(struct power_supply *psy, 
static int ab8500_charger_init_hw_registers(struct ab8500_charger *di)

{

	int ret = 0;

	u8 bup_vch_range = 0, vbup33_vrtcn = 0;



	/* Setup maximum charger current and voltage for ABB cut2.0 */

	if (!is_ab8500_1p1_or_earlier(di->parent)) {
@@ -3112,12 +3111,6 @@ static int ab8500_charger_init_hw_registers(struct ab8500_charger *di) 
		goto out;

	}



	/* Backup battery voltage and current */

	if (di->bm->bkup_bat_v > BUP_VCH_SEL_3P1V)

		bup_vch_range = BUP_VCH_RANGE;

	if (di->bm->bkup_bat_v == BUP_VCH_SEL_3P3V)

		vbup33_vrtcn = VBUP33_VRTCN;



	ret = abx500_set_register_interruptible(di->dev,

		AB8500_RTC,

		AB8500_RTC_BACKUP_CHG_REG,