From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 1 Oct 2025 20:02:59 +0000 (-0700)
Subject: Merge tag 'for-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ee22ad492a49303f54d4e1c5168327742ac7aaf;p=thirdparty%2Fkernel%2Fstable.git

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

Pull power supply and reset updates from Sebastian Reichel:
 "Power-supply core:
   - introduce adc-battery-helper for capacity estimation based on
     simple ADC readings of battery voltage and current
   - add new properties for battery internal resistance and state of
     health

  Power-supply drivers:
   - ug3105_battery: convert to adc-battery-helper
   - intel_dc_ti_battery: New driver for Intel Dollar Cove TI batteries
   - rt9467-charger: add voltage and current ADC support
   - sbs-charger: support multiple instances
   - qcom_battmgr:
       - add charge control support
       - add support for state of health and internal resistance
   - max77705_charger:
       - big driver cleanup
       - add support for setting charge current
   - misc minor fixes and cleanups"

* tag 'for-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (38 commits)
  power: supply: qcom_battmgr: handle charging state change notifications
  power: supply: max77705_charger: use REGMAP_IRQ_REG_LINE macro
  power: supply: max77705_charger: rework interrupts
  power: supply: max77705_charger: add writable properties
  power: supply: max77705_charger: return error when config fails
  power: supply: max77705_charger: use regfields for config registers
  power: supply: max77705_charger: refactoring: rename charger to chg
  mfd: max77705: max77705_charger: move active discharge setting to mfd parent
  power: supply: max77976_charger: fix constant current reporting
  power: supply: qcom_battmgr: Add charge control support
  dt-bindings: soc: qcom,pmic-glink: Add charge limit nvmem properties
  power: supply: qcom_battmgr: update compats for SM8550 and X1E80100
  power: supply: qcom_battmgr: Add state_of_health property
  power: supply: qcom_battmgr: Add resistance power supply property
  power: supply: core: Add state_of_health power supply property
  power: supply: core: Add resistance power supply property
  power: supply: rx51: remove redundant condition checks
  dt-bindings: power: supply: bq24190: document charge enable pin
  dt-bindings: power: supply: bq27xxx: document optional interrupt
  power: supply: intel_dc_ti_battery: Drop no longer relevant comment
  ...
---

3ee22ad492a49303f54d4e1c5168327742ac7aaf
diff --cc drivers/mfd/max77705.c
index 62dbc63efa8d0,ff07d0e0d5f8e..e1a9bfd658560
--- a/drivers/mfd/max77705.c
+++ b/drivers/mfd/max77705.c
@@@ -108,10 -108,13 +108,13 @@@ static int max77705_i2c_probe(struct i2
  	if (pmic_rev != MAX77705_PASS3)
  		return dev_err_probe(dev, -ENODEV, "Rev.0x%x is not tested\n", pmic_rev);
  
+ 	/* Active Discharge Enable */
+ 	regmap_update_bits(max77705->regmap, MAX77705_PMIC_REG_MAINCTRL1, 1, 1);
+ 
  	ret = devm_regmap_add_irq_chip(dev, max77705->regmap,
  					i2c->irq,
 -					IRQF_ONESHOT | IRQF_SHARED, 0,
 -					&max77705_topsys_irq_chip,
 +					IRQF_ONESHOT, 0,
 +					&max77705_irq_chip,
  					&irq_data);
  	if (ret)
  		return dev_err_probe(dev, ret, "Failed to add IRQ chip\n");