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

Merge tag 'for-v6.14' 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 power supply extensions, which allows adding properties
     to a power supply device from a separate driver. This will be used
     initially to extend the generic ACPI charger/battery driver with
     vendor extensions for charge thresholds.

   - convert all drivers from power_supply_for_each_device to new
     power_supply_for_each_psy(), which avoids lots of casting being
     done in the drivers.

   - avoid LED trigger like values in uevent for
     POWER_SUPPLY_PROP_CHARGE_BEHAVIOUR

   - introduce POWER_SUPPLY_PROP_CHARGE_TYPES, which is similar to the
     POWER_SUPPLY_PROP_CHARGE_TYPE property, but also lists the
     available options on the specific platform

  Power-supply drivers

   - dell-laptop: use new power_supply_charge_types_show/_parse helpers

   - stc3117: new driver for equally named fuel gauge chip

   - bq24190: add support for new POWER_SUPPLY_PROP_CHARGE_TYPES

   - bq24190: add BQ24297 support

   - bq27xxx: add voltage min design for bq27000/bq27200

   - cros_charge-control: convert to new power supply extension API

   - multiple drivers: constify 'struct bin_attribute'

   - ds2782: convert to device managed resources

   - max1720x: add charge full property

   - max1720x: support extra thermistor temperatures

   - max17042: add max77705 support

   - ip5xxx-power: add support for IP5306

   - ltc4162-l-charger: add ltc4162-f/s and ltc4015 support

   - gpio-charger: support for default charge current limit

   - misc small cleanups and fixes

  Reset drivers:

   - at91-poweroff: add sam9x7 support"

* tag 'for-v6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (77 commits)
  power: supply: max1720x: add support for reading internal and thermistor temperatures
  power: supply: ltc4162l: Use GENMASK macro in bitmask operation
  power: supply: max17042: add max77705 fuel gauge support
  dt-bindings: power: supply: max17042: add max77705 support
  power: supply: add undervoltage health status property
  power: supply: max17042: add platform driver variant
  power: supply: max17042: make interrupt shared
  power: reset: keystone: Use syscon_regmap_lookup_by_phandle_args
  power: supply: Use str_enable_disable-like helpers
  platform/x86: dell-laptop: Use power_supply_charge_types_show/_parse() helpers
  power: supply: bq2415x_charger: Immediately reschedule delayed work on notifier events
  power: supply: Add STC3117 fuel gauge unit driver
  dt-bindings: power: supply: Add STC3117 Fuel Gauge
  power: supply: ug3105_battery: Let the core handle POWER_SUPPLY_PROP_TECHNOLOGY
  power: supply: gpio-charger: add support for default charge current limit
  dt-bindings: power: supply: gpio-charger: add support for default charge current limit
  power: supply: Use power_supply_external_power_changed() in __power_supply_changed_work()
  power: supply: core: fix build of extension sysfs group if CONFIG_SYSFS=n
  power: supply: bq2415x_charger: report charging state changes to userspace
  bq27xxx: add voltage min design for bq27000 and bq27200
  ...
parents deee7487 b4a95b8f

Documentation/ABI/testing/sysfs-class-power

+30 −1
Original line number Diff line number Diff line
@@ -407,10 +407,30 @@ Description: 


		Access: Read, Write



		Reading this returns the current active value, e.g. 'Standard'.

		Check charge_types to get the values supported by the battery.



		Valid values:

			      "Unknown", "N/A", "Trickle", "Fast", "Standard",

			      "Adaptive", "Custom", "Long Life", "Bypass"



What:		/sys/class/power_supply/<supply_name>/charge_types

Date:		December 2024

Contact:	linux-pm@vger.kernel.org

Description:

		Identical to charge_type but reading returns a list of supported

		charge-types with the currently active type surrounded by square

		brackets, e.g.: "Fast [Standard] Long_Life".



		power_supply class devices may support both charge_type and

		charge_types for backward compatibility. In this case both will

		always have the same active value and the active value can be

		changed by writing either property.



		Note charge-types which contain a space such as "Long Life" will

		have the space replaced by a '_' resulting in e.g. "Long_Life".

		When writing charge-types both variants are accepted.



What:		/sys/class/power_supply/<supply_name>/charge_term_current

Date:		July 2014

Contact:	linux-pm@vger.kernel.org
@@ -433,7 +453,7 @@ Description: 


		Valid values:

			      "Unknown", "Good", "Overheat", "Dead",

			      "Over voltage", "Unspecified failure", "Cold",

			      "Over voltage", "Under voltage", "Unspecified failure", "Cold",

			      "Watchdog timer expire", "Safety timer expire",

			      "Over current", "Calibration required", "Warm",

			      "Cool", "Hot", "No battery"
@@ -793,3 +813,12 @@ Description: 


		Access: Read

		Valid values: 1-31



What:		/sys/class/power_supply/<supply_name>/extensions/<extension_name>

Date:		March 2025

Contact:	linux-pm@vger.kernel.org

Description:

		Reports the extensions registered to the power supply.

		Each entry is a link to the device which registered the extension.



		Access: Read

Documentation/ABI/testing/sysfs-class-power-max1720x

0 → 100644
+32 −0
Original line number Diff line number Diff line 
What:		/sys/class/power_supply/max1720x/temp_ain1

Date:		January 2025

KernelVersion:	6.14

Contact:	Dimitri Fedrau <dimitri.fedrau@liebherr.com>

Description:

		Reports the current temperature reading from AIN1 thermistor.



		Access: Read



		Valid values: Represented in 1/10 Degrees Celsius



What:		/sys/class/power_supply/max1720x/temp_ain2

Date:		January 2025

KernelVersion:	6.14

Contact:	Dimitri Fedrau <dimitri.fedrau@liebherr.com>

Description:

		Reports the current temperature reading from AIN2 thermistor.



		Access: Read



		Valid values: Represented in 1/10 Degrees Celsius



What:		/sys/class/power_supply/max1720x/temp_int

Date:		January 2025

KernelVersion:	6.14

Contact:	Dimitri Fedrau <dimitri.fedrau@liebherr.com>

Description:

		Reports the current temperature reading from internal die.



		Access: Read



		Valid values: Represented in 1/10 Degrees Celsius

Documentation/devicetree/bindings/power/reset/atmel,sama5d2-shdwc.yaml

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ properties: 
      - enum:

          - atmel,sama5d2-shdwc

          - microchip,sam9x60-shdwc

      - items:

          - const: microchip,sam9x7-shdwc

          - const: microchip,sam9x60-shdwc



  reg:

    maxItems: 1

Documentation/devicetree/bindings/power/supply/bq24190.yaml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ properties: 
      - ti,bq24192i

      - ti,bq24196

      - ti,bq24296

      - ti,bq24297



  reg:

    maxItems: 1

Documentation/devicetree/bindings/power/supply/gpio-charger.yaml

+6 −0
Original line number Diff line number Diff line
@@ -58,6 +58,10 @@ properties: 
            charge-current-limit-gpios property. Bit 1 second to last

            GPIO and so on.



  charge-current-limit-default-microamp:

    description: Default charge current limit. Must be listed in

      charge-current-limit-mapping.



required:

  - compatible
@@ -72,6 +76,7 @@ anyOf: 
dependencies:

  charge-current-limit-gpios: [ charge-current-limit-mapping ]

  charge-current-limit-mapping: [ charge-current-limit-gpios ]

  charge-current-limit-default-microamp: [charge-current-limit-mapping]



additionalProperties: false
@@ -91,4 +96,5 @@ examples: 
      charge-current-limit-mapping = <2500000 0x00>, // 2.5 A => both GPIOs low

                                     <700000 0x01>, // 700 mA => GPIO A.12 high

                                     <0 0x02>; // 0 mA => GPIO A.11 high

      charge-current-limit-default-microamp = <700000>;

    };