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

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

Pull power supply and reset updates from Sebastian Reichel:

 - bq25890: add charge voltage/current support

 - bd99954: convert to linear range

 - convert all i2c drivers to use probe_new

 - misc fixes and cleanups

* tag 'for-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (51 commits)
  power: supply: fix null pointer dereferencing in power_supply_get_battery_info
  power: supply: bq25890: Fix usb-notifier probe and remove races
  power: supply: bq25890: Ensure pump_express_work is cancelled on remove
  power: supply: Fix refcount leak in rk817_charger_probe
  power: supply: bq25890: Only use pdata->regulator_init_data for vbus
  power: supply: ab8500: Fix error handling in ab8500_charger_init()
  power: supply: cw2015: Fix potential null-ptr-deref in cw_bat_probe()
  power: supply: z2_battery: Fix possible memleak in z2_batt_probe()
  power: supply: z2_battery: Convert to i2c's .probe_new()
  power: supply: ucs1002: Convert to i2c's .probe_new()
  power: supply: smb347: Convert to i2c's .probe_new()
  power: supply: sbs-manager: Convert to i2c's .probe_new()
  power: supply: sbs: Convert to i2c's .probe_new()
  power: supply: rt9455: Convert to i2c's .probe_new()
  power: supply: rt5033_battery: Convert to i2c's .probe_new()
  power: supply: max17042_battery: Convert to i2c's .probe_new()
  power: supply: max17040: Convert to i2c's .probe_new()
  power: supply: max14656: Convert to i2c's .probe_new()
  power: supply: ltc4162-l: Convert to i2c's .probe_new()
  power: supply: ltc2941: Convert to i2c's .probe_new()
  ...
parents b611996e 104bb8a6

Documentation/devicetree/bindings/mfd/ene-kb930.yaml

+3 −3
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ description: | 
maintainers:

  - Dmitry Osipenko <digetx@gmail.com>



$ref: /schemas/power/supply/power-supply.yaml



properties:

  compatible:

    items:
@@ -22,15 +24,13 @@ properties: 
  reg:

    maxItems: 1



  monitored-battery: true

  power-supplies: true

  system-power-controller: true



required:

  - compatible

  - reg



additionalProperties: false

unevaluatedProperties: false



examples:

  - |

Documentation/devicetree/bindings/mfd/rockchip,rk817.yaml

+2 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ properties: 
      The child node for the charger to hold additional properties. If a

      battery is not in use, this node can be omitted.

    type: object

    $ref: /schemas/power/supply/power-supply.yaml



    properties:

      monitored-battery:

        description: |

Documentation/devicetree/bindings/power/reset/gpio-restart.yaml

+3 −10
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ description: > 
  inactive-delay, the GPIO is driven active again.  After a delay specified by wait-delay, the

  restart handler completes allowing other restart handlers to be attempted.



allOf:

  - $ref: restart-handler.yaml#



properties:

  compatible:

    const: gpio-restart
@@ -41,16 +44,6 @@ properties: 
      in its inactive state.



  priority:

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

    description: |

      A priority ranging from 0 to 255 (default 129) according to the following guidelines:



        0:   Restart handler of last resort, with limited restart capabilities.

        128: Default restart handler; use if no other restart handler is expected to be available,

             and/or if restart functionality is sufficient to restart the entire system.

        255: Highest priority restart handler, will preempt all other restart handlers.

    minimum: 0

    maximum: 255

    default: 129



  active-delay:

Documentation/devicetree/bindings/power/reset/restart-handler.yaml

0 → 100644
+30 −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/restart-handler.yaml#

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



title: Restart and shutdown handler generic binding



maintainers:

  - Sebastian Reichel <sre@kernel.org>



description:

  Restart and shutdown handler device is responsible for powering off the

  system, e.g. my cutting off the power.  System might have several restart

  handlers, which usually are tried from most precise to last resort.



properties:

  priority:

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

    description: |

      A priority ranging from 0 to 255 according to the following guidelines::

        0::   Restart handler of last resort, with limited restart capabilities.

        128:: Typical, default restart handler; use if no other restart handler

              is expected to be available, and/or if restart functionality is

              sufficient to restart the entire system.

        255:: Highest priority restart handler, will preempt all other restart handlers.

    minimum: 0

    maximum: 255



additionalProperties: true

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

+10 −6
Original line number Diff line number Diff line
@@ -15,11 +15,15 @@ allOf: 


properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - ti,bq25890

      - items:

          - enum:

              - ti,bq25892

              - ti,bq25895

              - ti,bq25896

          - const: ti,bq25890



  reg:

    maxItems: 1
@@ -93,7 +97,7 @@ required: 
  - ti,boost-voltage

  - ti,boost-max-current



additionalProperties: false

unevaluatedProperties: false



examples:

  - |