Commit 448ecd57 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-v6.13' 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:

   - replace power_supply_register_no_ws() with power_supply_register()
     and a new "no_wakeup_source" field in struct power_supply_config

   - constify battery info tables in the core and all drivers

   - switch back to remove callback for all platform drivers

   - allow power_supply_put() to be called from atomic context

   - mark attribute arrays read-only after init

  Power-supply drivers:

   - new driver for TWL6030 and TWL6032

   - rk817: improve battery capacity calibration

   - misc small cleanups and fixes"

* tag 'for-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (42 commits)
  power: reset: ep93xx: add AUXILIARY_BUS dependency
  dt-bindings: power: reset: Convert mode-.* properties to array
  power: supply: sc27xx: Fix battery detect GPIO probe
  dt-bindings: power: supply: sc27xx-fg: document deprecated bat-detect-gpio
  reset: keystone-reset: remove unused macros
  power: supply: axp20x_battery: Use scaled iio_read_channel
  power: supply: axp20x_usb_power: Use scaled iio_read_channel
  power: supply: generic-adc-battery: change my gmail
  power: supply: pmu_battery: Set power supply type to BATTERY
  power: Switch back to struct platform_driver::remove()
  power: supply: hwmon: move interface to private header
  power: supply: rk817: Update battery capacity calibration
  power: supply: rk817: stop updating info in suspend
  power: supply: rt9471: Use IC status regfield to report real charger status
  power: supply: rt9471: Fix wrong WDT function regfield declaration
  dt-bindings: power/supply: qcom,pmi8998-charger: Drop incorrect "#interrupt-cells" from example
  power: supply: core: mark attribute arrays as ro_after_init
  power: supply: core: unexport power_supply_property_is_writeable()
  power: supply: core: use device mutex wrappers
  power: supply: bq27xxx: Fix registers of bq27426
  ...
parents 1fdae000 b6d445f6

Documentation/devicetree/bindings/power/reset/nvmem-reboot-mode.yaml

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ properties: 
allOf:

  - $ref: reboot-mode.yaml#



patternProperties:

  "^mode-.*$":

    maxItems: 1



required:

  - compatible

  - nvmem-cells

Documentation/devicetree/bindings/power/reset/qcom,pon.yaml

+7 −0
Original line number Diff line number Diff line
@@ -54,6 +54,10 @@ required: 
  - compatible

  - reg



patternProperties:

  "^mode-.*$":

    maxItems: 1



unevaluatedProperties: false



allOf:
@@ -75,6 +79,9 @@ allOf: 
        reg-names:

          items:

            - const: pon

    else:

      patternProperties:

        "^mode-.*$": false



    # Special case for pm8941, which doesn't store reset mode

  - if:

Documentation/devicetree/bindings/power/reset/reboot-mode.yaml

+2 −2
Original line number Diff line number Diff line
@@ -28,13 +28,13 @@ description: | 


properties:

  mode-normal:

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

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

    description:

      Default value to set on a reboot if no command was provided.



patternProperties:

  "^mode-.*$":

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

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



additionalProperties: true

Documentation/devicetree/bindings/power/reset/syscon-reboot-mode.yaml

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ properties: 
allOf:

  - $ref: reboot-mode.yaml#



patternProperties:

  "^mode-.*$":

    maxItems: 1



unevaluatedProperties: false



required:

Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml

+10 −1
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ properties: 
    $ref: /schemas/types.yaml#/definitions/uint32

    description: Offset in the register map for the reboot register (in bytes).



  reg:

    maxItems: 1

    description: Base address and size for the reboot register.



  regmap:

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

    deprecated: true
@@ -45,9 +49,14 @@ properties: 
  priority:

    default: 192



oneOf:

  - required:

      - offset

  - required:

      - reg



required:

  - compatible

  - offset



additionalProperties: false