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

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

Pull power supply and reset updates from Sebastian Reichel:
 "No core patches, only driver updates:

   - pwr-mlxbf: new reset driver for Mellanox BlueField

   - at91-reset: SAMA7G5 support

   - ab8500: continue refurbishing

   - misc minor fixes"

* tag 'for-v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (29 commits)
  power: supply: olpc_battery: Hold the reference returned by of_find_compatible_node
  power: supply: ab8500: add missing destroy_workqueue in ab8500_charger_bind
  power: supply: ab8500: Remove flush_scheduled_work() call.
  power: supply: ab8500_fg: drop duplicated 'is' in comment
  power: supply: ab8500: Drop external charger leftovers
  power: supply: ab8500: Add MAINTAINERS entry
  dt-bindings: power: reset: qcom,pshold: convert to dtschema
  power: supply: Fix typo in power_supply_check_supplies
  power: reset: pwr-mlxbf: change rst_pwr_hid and low_pwr_hid from global to local variables
  power: reset: pwr-mlxbf: add missing include
  power: reset: at91-reset: add support for SAMA7G5
  power: reset: at91-reset: add reset_controller_dev support
  power: reset: at91-reset: add at91_reset_data
  power: reset: at91-reset: document structures and enums
  dt-bindings: reset: add sama7g5 definitions
  dt-bindings: reset: atmel,at91sam9260-reset: add sama7g5 bindings
  dt-bindings: reset: convert Atmel/Microchip reset controller to YAML
  power: reset: pwr-mlxbf: add BlueField SoC power control driver
  power: supply: ab8500: Exit maintenance if too low voltage
  power: supply: ab8500: Respect charge_restart_voltage_uv
  ...
parents d16b418f c9d84681

Documentation/devicetree/bindings/arm/atmel-sysregs.txt

+0 −15
Original line number Diff line number Diff line
@@ -25,21 +25,6 @@ System Timer (ST) required properties: 
Its subnodes can be:

- watchdog: compatible should be "atmel,at91rm9200-wdt"



RSTC Reset Controller required properties:

- compatible: Should be "atmel,<chip>-rstc".

  <chip> can be "at91sam9260", "at91sam9g45", "sama5d3" or "samx7"

  it also can be "microchip,sam9x60-rstc"

- reg: Should contain registers location and length

- clocks: phandle to input clock.



Example:



	rstc@fffffd00 {

		compatible = "atmel,at91sam9260-rstc";

		reg = <0xfffffd00 0x10>;

		clocks = <&clk32k>;

	};



RAMC SDRAM/DDR Controller required properties:

- compatible: Should be "atmel,at91rm9200-sdramc", "syscon"

			"atmel,at91sam9260-sdramc",

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

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
MSM Restart Driver



A power supply hold (ps-hold) bit is set to power the msm chipsets.

Clearing that bit allows us to restart/poweroff. The difference

between poweroff and restart is determined by unique power manager IC

settings.



Required Properties:

-compatible: "qcom,pshold"

-reg: Specifies the physical address of the ps-hold register



Example:



	restart@fc4ab000 {

		compatible = "qcom,pshold";

		reg = <0xfc4ab000 0x4>;

	};

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

0 → 100644
+35 −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/qcom,pshold.yaml#

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



title: Qualcomm SoC restart and power off



maintainers:

  - Bjorn Andersson <bjorn.andersson@linaro.org>



description:

  A power supply hold (ps-hold) bit is set to power the Qualcomm chipsets.

  Clearing that bit allows us to restart/power off. The difference between

  power off and restart is determined by unique power manager IC settings.



properties:

  compatible:

    const: qcom,pshold



  reg:

    maxItems: 1



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    reset-controller@fc4ab000 {

        compatible = "qcom,pshold";

        reg = <0xfc4ab000 0x4>;

    };

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

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ properties: 
    maxItems: 1



  usb-otg-vbus:

    type: object

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

    description: |

      Regulator that is used to control the VBUS voltage direction for

      either USB host mode or for charging on the OTG port

Documentation/devicetree/bindings/power/supply/qcom,pm8941-charger.yaml

+8 −1
Original line number Diff line number Diff line
@@ -117,11 +117,18 @@ properties: 
      be done externally to fully comply with the JEITA safety guidelines if this flag

      is set.



  usb-charge-current-limit:

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

    minimum: 100000

    maximum: 2500000

    description: |

      Default USB charge current limit in uA.



  usb-otg-in-supply:

    description: Reference to the regulator supplying power to the USB_OTG_IN pin.



  otg-vbus:

    type: object

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

    description: |

      This node defines a regulator used to control the direction of VBUS voltage.

      Specifically whether to supply voltage to VBUS for host mode operation of the OTG port,