Commit 59bd5ae0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-v7.1' 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 drivers:
   - S2MU005: new battery fuel gauge driver
   - macsmc-power: new driver for Apple Silicon
   - qcom_battmgr: Add support for Glymur and Kaanapali
   - max17042: add support for max77759
   - qcom_smbx: allow disabling charging
   - bd71828: add input current limit support
   - multiple drivers: use new device managed workqueue allocation
     function
   - misc small cleanups and fixes

  Reset core:
   - Expose sysfs for registered reboot_modes

  Reset drivers
   - misc small cleanups and fixes"

* tag 'for-v7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (36 commits)
  power: supply: qcom_smbx: allow disabling charging
  power: reset: drop unneeded dependencies on OF_GPIO
  power: supply: bd71828: add input current limit property
  dt-bindings: power: reset: cortina,gemini-power-controller: convert to DT schema
  power: supply: add support for S2MU005 battery fuel gauge device
  dt-bindings: power: supply: document Samsung S2MU005 battery fuel gauge
  power: reset: reboot-mode: fix -Wformat-security warning
  power: supply: ipaq_micro: Simplify with devm
  power: supply: mt6370: Simplify with devm_alloc_ordered_workqueue()
  power: supply: max77705: Free allocated workqueue and fix removal order
  power: supply: max77705: Drop duplicated IRQ error message
  power: supply: cw2015: Free allocated workqueue
  power: reset: keystone: Use register_sys_off_handler(SYS_OFF_MODE_RESTART)
  power: supply: twl4030_madc: Drop unused header includes
  power: supply: bq24190: Avoid rescheduling after cancelling work
  power: supply: axp288_charger: Simplify returns of dev_err_probe()
  power: supply: axp288_charger: Do not cancel work before initializing it
  power: supply: cpcap-battery: pass static battery cell data from device tree
  dt-bindings: power: supply: cpcap-battery: document monitored-battery property
  power: supply: qcom_battmgr: Add support for Glymur and Kaanapali
  ...
parents e0dcd2b2 98d68b74

Documentation/ABI/testing/sysfs-class-reboot-mode-reboot_modes

0 → 100644
+36 −0
Original line number Diff line number Diff line 
What:		/sys/class/reboot-mode/<driver>/reboot_modes

Date:		March 2026(TBD)

KernelVersion:	TBD

Contact:	linux-pm@vger.kernel.org

		Description:

		This interface exposes the reboot-mode arguments

		registered with the reboot-mode framework. It is

		a read-only interface and provides a space

		separated list of reboot-mode arguments supported

		on the current platform.

		Example:

		 recovery fastboot bootloader



		The exact sysfs path may vary depending on the

		name of the driver that registers the arguments.

		Example:

		 /sys/class/reboot-mode/nvmem-reboot-mode/reboot_modes

		 /sys/class/reboot-mode/syscon-reboot-mode/reboot_modes

		 /sys/class/reboot-mode/qcom-pon/reboot_modes



		The supported arguments can be used by userspace to

		invoke device reset using the standard reboot() system

		call interface, with the "argument" as string to "*arg"

		parameter along with LINUX_REBOOT_CMD_RESTART2.



		A driver can expose the supported arguments by

		registering them with the reboot-mode framework

		using the property names that follow the

		mode-<argument> format.

		Example:

		 mode-bootloader, mode-recovery.



		This attribute is useful for scripts or initramfs

		logic that need to programmatically determine

		which reboot-mode arguments are valid before

		triggering a reboot.

Documentation/devicetree/bindings/power/reset/cortina,gemini-power-controller.yaml

0 → 100644
+42 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/power/reset/cortina,gemini-power-controller.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Cortina Systems Gemini Poweroff Controller



maintainers:

  - Linus Walleij <linusw@kernel.org>



description: |

  The Gemini power controller is a dedicated IP block in the Cortina Gemini SoC that

  controls system power-down operations.



properties:

  compatible:

    const: cortina,gemini-power-controller



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



required:

  - compatible

  - reg

  - interrupts



additionalProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/irq.h>



    poweroff@4b000000 {

      compatible = "cortina,gemini-power-controller";

      reg = <0x4b000000 0x100>;

      interrupts = <26 IRQ_TYPE_EDGE_FALLING>;

    };

...

Documentation/devicetree/bindings/power/reset/gemini-poweroff.txt

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
* Device-Tree bindings for Cortina Systems Gemini Poweroff



This is a special IP block in the Cortina Gemini SoC that only

deals with different ways to power the system down.



Required properties:

- compatible: should be "cortina,gemini-power-controller"

- reg: should contain the physical memory base and size

- interrupts: should contain the power management interrupt



Example:



power-controller@4b000000 {

	compatible = "cortina,gemini-power-controller";

	reg = <0x4b000000 0x100>;

	interrupts = <26 IRQ_TYPE_EDGE_FALLING>;

};

Documentation/devicetree/bindings/power/supply/cpcap-battery.yaml

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ properties: 
      - const: chg_isense

      - const: batti



  monitored-battery: true

  power-supplies: true



required:

Documentation/devicetree/bindings/power/supply/maxim,max17042.yaml

+14 −7
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ properties: 
      - maxim,max17050

      - maxim,max17055

      - maxim,max77705-battery

      - maxim,max77759-fg

      - maxim,max77849-battery



  reg:
@@ -27,36 +28,42 @@ properties: 


  interrupts:

    maxItems: 1

    description: |

      The ALRT pin, an open-drain interrupt.

    description:

      The ALRT pin (or FG_INTB pin on MAX77759), an open-drain interrupt.



  shunt-resistor-micro-ohms:

    description:

      Resistance of rsns resistor in micro Ohms (datasheet-recommended value is 10000).

      Defining this property enables current-sense functionality.



  maxim,rsns-microohm:

    deprecated: true

    $ref: /schemas/types.yaml#/definitions/uint32

    description: |

    description:

      Resistance of rsns resistor in micro Ohms (datasheet-recommended value is 10000).

      Defining this property enables current-sense functionality.



  maxim,cold-temp:

    $ref: /schemas/types.yaml#/definitions/uint32

    description: |

    description:

      Temperature threshold to report battery as cold (in tenths of degree Celsius).

      Default is not to report cold events.



  maxim,over-heat-temp:

    $ref: /schemas/types.yaml#/definitions/uint32

    description: |

    description:

      Temperature threshold to report battery as over heated (in tenths of degree Celsius).

      Default is not to report over heating events.



  maxim,dead-volt:

    $ref: /schemas/types.yaml#/definitions/uint32

    description: |

    description:

      Voltage threshold to report battery as dead (in mV).

      Default is not to report dead battery events.



  maxim,over-volt:

    $ref: /schemas/types.yaml#/definitions/uint32

    description: |

    description:

      Voltage threshold to report battery as over voltage (in mV).

      Default is not to report over-voltage events.