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

Merge tag 'regulator-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator 

Pull regulator updates from Mark Brown:
 "Quite an active release for driver specific updates but very little
  going on at the subsystem level this time for the regulator API.

  Summary:

   - Overhaul of the Qualcomm LABIBB driver.

   - Allow use of regulator_sync_voltage() on coupled regulators.

   - Support for Action ATC260x, Mediatek DVSRC and MT6315, Qualcomm
     PCM8180/c and PM8009-1 and Richtek RT4831

   - Removal of the AB3100 driver"

* tag 'regulator-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (49 commits)
  regulator: bd718x7, bd71828, Fix dvs voltage levels
  regulator: pca9450: Add sd-vsel GPIO
  regulator: pca9450: Enable system reset on WDOG_B assertion
  regulator: pca9450: Add SD_VSEL GPIO for LDO5
  regulator: qcom-rpmh: fix pm8009 ldo7
  regulator: mt6315: Add support for MT6315 regulator
  regulator: document binding for MT6315 regulator
  regulator: dt-bindings: Document charger-supply for max8997
  regulator: qcom-labibb: Use disable_irq_nosync from isr
  regulator: pf8x00: Fix typo for PF8200 chip name
  regulator: pf8x00: set ramp_delay for bucks
  regulator: core: Avoid debugfs: Directory ... already present! error
  regulator: pf8x00: Add suspend support
  regulator: Make regulator_sync_voltage() usable by coupled regulators
  regulator: s5m8767: Drop regulators OF node reference
  regulator: qcom-rpmh: Add pmc8180 and pmc8180c
  regulator: qcom-rpmh: Add pmc8180 and pmc8180c
  regulator: s5m8767: Fix reference count leak
  regulator: remove ab3100 driver
  regulator: axp20x: Fix reference cout leak
  ...
parents 05a6fb94 f03e2a72

Documentation/devicetree/bindings/regulator/max8997-regulator.txt

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ Optional properties: 
- interrupts: Interrupt specifiers for two interrupt sources.

  - First interrupt specifier is for 'irq1' interrupt.

  - Second interrupt specifier is for 'alert' interrupt.

- charger-supply: regulator node for charging current.

- max8997,pmic-buck1-uses-gpio-dvs: 'buck1' can be controlled by gpio dvs.

- max8997,pmic-buck2-uses-gpio-dvs: 'buck2' can be controlled by gpio dvs.

- max8997,pmic-buck5-uses-gpio-dvs: 'buck5' can be controlled by gpio dvs.

Documentation/devicetree/bindings/regulator/mcp16502-regulator.txt

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ Required properties: 
- compatible: "microchip,mcp16502"

- reg: I2C slave address

- lpm-gpios: GPIO for LPM pin. Note that this GPIO *must* remain high during

	     suspend-to-ram, keeping the PMIC into HIBERNATE mode.

	     suspend-to-ram, keeping the PMIC into HIBERNATE mode; this

	     property is optional;

- regulators: A node that houses a sub-node for each regulator within

              the device. Each sub-node is identified using the node's

              name. The content of each sub-node is defined by the

Documentation/devicetree/bindings/regulator/mt6315-regulator.yaml

0 → 100644
+69 −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/regulator/mt6315-regulator.yaml#

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



title: Mediatek MT6315 Regulator



maintainers:

  - Hsin-Hsiung Wang <hsin-hsiung.wang@mediatek.com>



description: |

  The MT6315 is a power management IC (PMIC) configurable with SPMI.

  that contains 4 BUCKs output which can combine with each other

  by different efuse settings.



properties:

  compatible:

    const: mediatek,mt6315-regulator



  reg:

    maxItems: 1



  regulators:

    type: object

    description: List of regulators and its properties



    patternProperties:

      "^vbuck[1-4]$":

        type: object

        $ref: "regulator.yaml#"



        properties:

          regulator-name:

            pattern: "^vbuck[1-4]$"



    additionalProperties: false



required:

  - compatible

  - reg

  - regulators



additionalProperties: false



examples:

  - |

    pmic@6 {

      compatible = "mediatek,mt6315-regulator";

      reg = <0x6 0>;



      regulators {

        vbuck1 {

          regulator-compatible = "vbuck1";

          regulator-min-microvolt = <300000>;

          regulator-max-microvolt = <1193750>;

          regulator-enable-ramp-delay = <256>;

          regulator-allowed-modes = <0 1 2 4>;

        };



        vbuck3 {

          regulator-compatible = "vbuck3";

          regulator-min-microvolt = <300000>;

          regulator-max-microvolt = <1193750>;

          regulator-enable-ramp-delay = <256>;

          regulator-allowed-modes = <0 1 2 4>;

        };

      };

    };

Documentation/devicetree/bindings/regulator/nxp,pca9450-regulator.yaml

+5 −0
Original line number Diff line number Diff line
@@ -87,6 +87,11 @@ properties: 


    additionalProperties: false



  sd-vsel-gpios:

    description: GPIO that is used to switch LDO5 between being configured by

      LDO5CTRL_L or LDO5CTRL_H register. Use this if the SD_VSEL signal is

      connected to a host GPIO.



required:

  - compatible

  - reg

Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml

+5 −12
Original line number Diff line number Diff line
@@ -62,8 +62,11 @@ properties: 
            $ref: "/schemas/types.yaml#/definitions/uint32"

            minimum: 2100

            maximum: 4500

            deprecated: true

            description:

              BUCK regulators current limit in mA.

              This property is deprecated, please use

              "regulator-max-microamp" instead.



              Listed current limits in mA are,

              2100 (default)
@@ -73,21 +76,11 @@ properties: 


          nxp,phase-shift:

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

            minimum: 45

            maximum: 0

            default: 0

            enum: [ 0, 45, 90, 135, 180, 225, 270, 315 ]

            description:

              BUCK regulators phase shift control in degrees.



              Listed phase shift control values in degrees are,

              45

              90

              135

              180

              225

              270

              315

              0 (default)



        unevaluatedProperties: false



      "^vsnvs$":