Commit 72e65f7e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull power supply and reset updates from Sebastian Reichel:
 "Miscellaneous small fixes and improvements all over the place.

  Nothing stands out in particular"

* tag 'for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (30 commits)
  power: supply: bq25890: Fix initial setting of the F_CONV_RATE field
  power: supply: bq25890: Fix race causing oops at boot
  power: supply: bq27xxx: Fix kernel crash on IRQ handler register error
  power: bq25890: add return values to error messages
  power: supply: axp288-charger: Simplify axp288_get_charger_health()
  power: supply: axp288-charger: Remove unnecessary is_present and is_online helpers
  power: supply: axp288-charger: Add depends on IOSF_MBIO to Kconfig
  power: supply: ab8500_bmdata: Use standard phandle
  dt-bindings: power: supply: ab8500: Standard monitored-battery
  power: supply: axp288_charger: Fix missing mutex_init()
  power: supply: max17042_battery: Prevent int underflow in set_soc_threshold
  power: supply: max17042_battery: Clear status bits in interrupt handler
  MAINTAINERS: power: supply: max17040: add entry with reviewers
  MAINTAINERS: power: supply: max17042: add entry with reviewers
  power: supply: max17040: fix null-ptr-deref in max17040_probe()
  power: supply: rt5033_battery: Change voltage values to µV
  power: supply: axp288-charger: Optimize register reading method
  dt-bindings: power: Bindings for Samsung batteries
  power: supply: cpcap-battery: use device_get_match_data() to simplify code
  power: supply: max17042_battery: fix typo in MAX17042_IAvg_empty
  ...
parents c1e2e035 22ad4f99

Documentation/ABI/testing/sysfs-class-power

+13 −0
Original line number Diff line number Diff line
@@ -480,6 +480,19 @@ Description: 


		Valid values: Represented in microvolts



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

Date:		January 2010

Contact:	linux-pm@vger.kernel.org

Description:

		Reports the number of full charge + discharge cycles the

		battery has undergone.



		Access: Read



		Valid values:

			Integer > 0: representing full cycles

			Integer = 0: cycle_count info is not available



**USB Properties**



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

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

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ required: 
  - compatible

  - reg



additionalProperties: false

unevaluatedProperties: false



examples:

  - |

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

0 → 100644
+56 −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/samsung,battery.yaml#

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



title: Samsung SDI Batteries



maintainers:

  - Linus Walleij <linus.walleij@linaro.org>



description: |

  Samsung SDI (Samsung Digital Interface) batteries are all different versions

  of lithium ion chemistry devices used for mobile phones, laptops and other

  portable electronics. The batteries are adapted to a specific product and

  the physical restrictions make it impossible to use another battery with the

  product, so product device trees can specify these batteries. Operating

  systems should determine hardware characteristics of the batteries from the

  compatible string.



properties:

  compatible:

    oneOf:

      - const: samsung,eb-l1m7flu

        description: 3.8V 1500 mAh battery used in Samsung GT-I8190

      - const: samsung,eb425161la

        description: 3.8V 1500 mAh battery used in Samsung SGH-T599 and SGH-I407

      - const: samsung,eb425161lu

        description: 3.8V 1500 mAh battery used in Samsung GT-I8160

      - const: samsung,eb485159lu

        description: 3.8V 1700 mAh battery used in Samsung GT-S7710

      - const: samsung,eb535151vu

        description: 3.8V 1500 mAh battery used in Samsung GT-I9070

      - const: samsung,eb585157lu

        description: 3.8V 2000 mAh battery used in Samsung GT-I8530



required:

  - compatible



additionalProperties: false



examples:

  - |

    power {

      #address-cells = <1>;

      #size-cells = <0>;



      battery: battery {

        compatible = "samsung,eb425161la";

      };



      charger@11 {

        reg = <0x11>;

        monitored-battery = <&battery>;

      };

    };

Documentation/devicetree/bindings/power/supply/stericsson,ab8500-btemp.yaml

+7 −3
Original line number Diff line number Diff line
@@ -17,10 +17,14 @@ properties: 
  compatible:

    const: stericsson,ab8500-btemp



  battery:

  monitored-battery:

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

    description: phandle to battery node



  battery:

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

    deprecated: true



  interrupts:

    maxItems: 5
@@ -42,7 +46,7 @@ properties: 


required:

  - compatible

  - battery

  - monitored-battery

  - interrupts

  - interrupt-names

  - io-channels
@@ -56,7 +60,7 @@ examples: 
    pmic {

      battery-temperature {

        compatible = "stericsson,ab8500-btemp";

        battery = <&ab8500_battery>;

        monitored-battery = <&battery>;

        interrupts = <20 IRQ_TYPE_LEVEL_HIGH>,

                     <80 IRQ_TYPE_LEVEL_HIGH>,

                     <83 IRQ_TYPE_LEVEL_HIGH>,

Documentation/devicetree/bindings/power/supply/stericsson,ab8500-chargalg.yaml

+7 −3
Original line number Diff line number Diff line
@@ -17,13 +17,17 @@ properties: 
  compatible:

    const: stericsson,ab8500-chargalg



  battery:

  monitored-battery:

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

    description: phandle to battery node



  battery:

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

    deprecated: true



required:

  - compatible

  - battery

  - monitored-battery



additionalProperties: false
@@ -32,6 +36,6 @@ examples: 
    pmic {

      charging-algorithm {

        compatible = "stericsson,ab8500-chargalg";

        battery = <&ab8500_battery>;

        monitored-battery = <&ab8500_battery>;

      };

    };