Commit 4520dcbe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull power supply and reset updates from Sebastian Reichel:
 "Battery/charger related:
   - cros-peripheral-charger: new driver
   - mt6360-charger: new driver
   - simple-battery: support reading chemistry info
   - max17042-battery: add max77849 support
   - sbs-battery: add time_to_empty_now support
   - smb347-charger: prepare USB OTG support
   - rn5t618: add voltage_now support
   - axp288: cleanup & optimizations
   - max17042_battery: cleanups
   - ab8500: cleanups
   - misc minor cleanups and DT binding fixes

  reset related:
   - tps65086-restart: new driver
   - linkstation-poweroff: support NETGEAR ReadyNAS Duo v2"

* tag 'for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (51 commits)
  power: supply: core: Fix parsing of battery chemistry/technology
  power: supply: max17042_battery: log SOC threshold using debug log level
  power: supply: max17042_battery: more robust chip type checks
  power: supply: max17042_battery: fix typo in MAx17042_TOFF
  power: supply: max17042_battery: clean up MAX17055_V_empty
  power: supply: smb347-charger: Implement USB VBUS regulator
  power: supply: smb347-charger: Add missing pin control activation
  power: supply: smb347-charger: Utilize generic regmap caching
  power: supply: smb347-charger: Make smb347_set_writable() IRQ-safe
  dt-bindings: power: supply: smb347-charger: Document USB VBUS regulator
  power: reset: Add TPS65086 restart driver
  dt-bindings: power: supply: max17042: describe interrupt
  power: supply: max17042: remove duplicated STATUS bit defines
  power: supply: max17042: handle fails of reading status register
  power: supply: core: Parse battery chemistry/technology
  dt-bindings: power: Extend battery bindings with chemistry
  power: reset: linkstation-poweroff: add new device
  power: reset: linkstation-poweroff: prepare for new devices
  power: supply: bq24735: reorganize ChargeOption command macros
  power: supply: rn5t618: Add voltage_now property
  ...
parents 0da9bc6d c9398455

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

+14 −0
Original line number Diff line number Diff line
@@ -31,6 +31,20 @@ properties: 
  compatible:

    const: simple-battery



  device-chemistry:

    description: This describes the chemical technology of the battery.

    oneOf:

      - const: nickel-cadmium

      - const: nickel-metal-hydride

      - const: lithium-ion

        description: This is a blanket type for all lithium-ion batteries,

          including those below. If possible, a precise compatible string

          from below should be used, but sometimes it is unknown which specific

          lithium ion battery is employed and this wide compatible can be used.

      - const: lithium-ion-polymer

      - const: lithium-ion-iron-phosphate

      - const: lithium-ion-manganese-oxide



  over-voltage-threshold-microvolt:

    description: battery over-voltage limit

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

+3 −0
Original line number Diff line number Diff line
@@ -19,12 +19,15 @@ properties: 
      - maxim,max17047

      - maxim,max17050

      - maxim,max17055

      - maxim,max77849-battery



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1

    description: |

      The ALRT pin, an open-drain interrupt.



  maxim,rsns-microohm:

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

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

0 → 100644
+48 −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/supply/mt6360_charger.yaml#

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



title: Battery charger driver for MT6360 PMIC from MediaTek Integrated.



maintainers:

  - Gene Chen <gene_chen@richtek.com>



description: |

  This module is part of the MT6360 MFD device.

  Provides Battery Charger, Boost for OTG devices and BC1.2 detection.



properties:

  compatible:

    const: mediatek,mt6360-chg



  richtek,vinovp-microvolt:

    description: Maximum CHGIN regulation voltage in uV.

    enum: [ 5500000, 6500000, 11000000, 14500000 ]





  usb-otg-vbus-regulator:

    type: object

    description: OTG boost regulator.

    $ref: /schemas/regulator/regulator.yaml#



required:

  - compatible



additionalProperties: false



examples:

  - |

    mt6360_charger: charger {

      compatible = "mediatek,mt6360-chg";

      richtek,vinovp-microvolt = <14500000>;



      otg_vbus_regulator: usb-otg-vbus-regulator {

        regulator-compatible = "usb-otg-vbus";

        regulator-name = "usb-otg-vbus";

        regulator-min-microvolt = <4425000>;

        regulator-max-microvolt = <5825000>;

      };

    };

...

Documentation/devicetree/bindings/power/supply/summit,smb347-charger.yaml

+30 −0
Original line number Diff line number Diff line
@@ -73,6 +73,26 @@ properties: 
      - 1 # SMB3XX_SOFT_TEMP_COMPENSATE_CURRENT Current compensation

      - 2 # SMB3XX_SOFT_TEMP_COMPENSATE_VOLTAGE Voltage compensation



  summit,inok-polarity:

    description: |

      Polarity of INOK signal indicating presence of external power supply.

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

    enum:

      - 0 # SMB3XX_SYSOK_INOK_ACTIVE_LOW

      - 1 # SMB3XX_SYSOK_INOK_ACTIVE_HIGH



  usb-vbus:

    $ref: "../../regulator/regulator.yaml#"

    type: object



    properties:

      summit,needs-inok-toggle:

        type: boolean

        description: INOK signal is fixed and polarity needs to be toggled

                     in order to enable/disable output mode.



    unevaluatedProperties: false



allOf:

  - if:

      properties:
@@ -134,6 +154,7 @@ examples: 
            reg = <0x7f>;



            summit,enable-charge-control = <SMB3XX_CHG_ENABLE_PIN_ACTIVE_HIGH>;

            summit,inok-polarity = <SMB3XX_SYSOK_INOK_ACTIVE_LOW>;

            summit,chip-temperature-threshold-celsius = <110>;

            summit,mains-current-limit-microamp = <2000000>;

            summit,usb-current-limit-microamp = <500000>;
@@ -141,6 +162,15 @@ examples: 
            summit,enable-mains-charging;



            monitored-battery = <&battery>;



            usb-vbus {

                regulator-name = "usb_vbus";

                regulator-min-microvolt = <5000000>;

                regulator-max-microvolt = <5000000>;

                regulator-min-microamp = <750000>;

                regulator-max-microamp = <750000>;

                summit,needs-inok-toggle;

            };

        };

    };

Documentation/devicetree/bindings/power/supply/x-powers,axp20x-ac-power-supply.yaml

+7 −4
Original line number Diff line number Diff line
@@ -21,10 +21,13 @@ allOf: 


properties:

  compatible:

    enum:

      - x-powers,axp202-ac-power-supply

      - x-powers,axp221-ac-power-supply

      - x-powers,axp813-ac-power-supply

    oneOf:

      - const: x-powers,axp202-ac-power-supply

      - const: x-powers,axp221-ac-power-supply

      - items:

          - const: x-powers,axp803-ac-power-supply

          - const: x-powers,axp813-ac-power-supply

      - const: x-powers,axp813-ac-power-supply



required:

  - compatible