Commit 21ac5a96 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull regulator updates from Mark Brown:
 "This has been a very quiet release, mostly cleanups, API updates and
  simple device additions. I messed up slightly and there are a couple
  of duplicated commits resulting from me leaving things in my inbox
  which didn't seem worth removing by the time I noticed them.

   - Conversion of several drivers to GPIO descriptors

   - Build out the features of of the MP8859 driver

   - Support for Qualcomm PM4125 and PM6150"

* tag 'regulator-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (31 commits)
  regulator: lp8788-buck: fix copy and paste bug in lp8788_dvs_gpio_request()
  regulator: core: make regulator_class constant
  regulator: da9121: Remove unused of_gpio.h
  regulator: userspace-consumer: add module device table
  regulator: dt-bindings: gpio-regulator: Fix "gpios-states" and "states" array bounds
  regulator: mp8859: Implement set_current_limit()
  regulator: mp8859: Report slew rate
  regulator: mp8859: Support status and error readback
  regulator: mp8859: Support active discharge control
  regulator: mp8859: Support mode operations
  regulator: mp8859: Support enable control
  regulator: mp8859: Validate and log device identifier information
  regulator: mp8859: Specify register accessibility and enable caching
  regulator: max8998: Convert to GPIO descriptors
  regulator: max8997: Convert to GPIO descriptors
  regulator: lp8788-buck: Fully convert to GPIO descriptors
  regulator: da9055: Fully convert to GPIO descriptors
  regulator: max8973: Finalize switch to GPIO descriptors
  regulator: dt-bindings: qcom,usb-vbus-regulator: add support for PM4125
  regulator: dt-bindings: qcom,usb-vbus-regulator: add support for PM4125
  ...
parents b30f2db0 e6f0b08a

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

+3 −1
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ properties: 
        1: HIGH

      Default is LOW if nothing else is specified.

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

    minItems: 1

    maxItems: 8

    items:

      enum: [0, 1]
@@ -57,7 +58,8 @@ properties: 
      regulator and matching GPIO configurations to achieve them. If there are

      no states in the "states" array, use a fixed regulator instead.

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

    maxItems: 8

    minItems: 2

    maxItems: 256

    items:

      items:

        - description: Voltage in microvolts

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

deleted100644 → 0
+0 −144
Original line number Diff line number Diff line 
MCP16502 PMIC



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; 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

              standard binding for regulators; see regulator.txt.



Regulators of MCP16502 PMIC:

1) VDD_IO	- Buck (1.2 - 3.7 V)

2) VDD_DDR	- Buck (0.6 - 1.85 V)

3) VDD_CORE	- Buck (0.6 - 1.85 V)

4) VDD_OTHER	- BUCK (0.6 - 1.85 V)

5) LDO1		- LDO  (1.2 - 3.7 V)

6) LDO2		- LDO  (1.2 - 3.7 V)



Regulator modes:

2 - FPWM: higher precision, higher consumption

4 - AutoPFM: lower precision, lower consumption



Each regulator is defined using the standard binding for regulators.



Example:



mcp16502@5b {

	compatible = "microchip,mcp16502";

	reg = <0x5b>;

	status = "okay";

	lpm-gpios = <&pioBU 7 GPIO_ACTIVE_HIGH>;



	regulators {

		VDD_IO {

			regulator-name = "VDD_IO";

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <3700000>;

			regulator-initial-mode = <2>;

			regulator-allowed-modes = <2>, <4>;

			regulator-always-on;



			regulator-state-standby {

				regulator-on-in-suspend;

				regulator-mode = <4>;

			};



			regulator-state-mem {

				regulator-off-in-suspend;

				regulator-mode = <4>;

			};

		};



		VDD_DDR {

			regulator-name = "VDD_DDR";

			regulator-min-microvolt = <600000>;

			regulator-max-microvolt = <1850000>;

			regulator-initial-mode = <2>;

			regulator-allowed-modes = <2>, <4>;

			regulator-always-on;



			regulator-state-standby {

				regulator-on-in-suspend;

				regulator-mode = <4>;

			};



			regulator-state-mem {

				regulator-on-in-suspend;

				regulator-mode = <4>;

			};

		};



		VDD_CORE {

			regulator-name = "VDD_CORE";

			regulator-min-microvolt = <600000>;

			regulator-max-microvolt = <1850000>;

			regulator-initial-mode = <2>;

			regulator-allowed-modes = <2>, <4>;

			regulator-always-on;



			regulator-state-standby {

				regulator-on-in-suspend;

				regulator-mode = <4>;

			};



			regulator-state-mem {

				regulator-off-in-suspend;

				regulator-mode = <4>;

			};

		};



		VDD_OTHER {

			regulator-name = "VDD_OTHER";

			regulator-min-microvolt = <600000>;

			regulator-max-microvolt = <1850000>;

			regulator-initial-mode = <2>;

			regulator-allowed-modes = <2>, <4>;

			regulator-always-on;



			regulator-state-standby {

				regulator-on-in-suspend;

				regulator-mode = <4>;

			};



			regulator-state-mem {

				regulator-off-in-suspend;

				regulator-mode = <4>;

			};

		};



		LDO1 {

			regulator-name = "LDO1";

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <3700000>;

			regulator-always-on;



			regulator-state-standby {

				regulator-on-in-suspend;

			};



			regulator-state-mem {

				regulator-off-in-suspend;

			};

		};



		LDO2 {

			regulator-name = "LDO2";

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <3700000>;

			regulator-always-on;



			regulator-state-standby {

				regulator-on-in-suspend;

			};



			regulator-state-mem {

				regulator-off-in-suspend;

			};

		};



	};

};

Documentation/devicetree/bindings/regulator/microchip,mcp16502.yaml

0 → 100644
+180 −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/microchip,mcp16502.yaml#

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



title: MCP16502 - High-Performance PMIC



maintainers:

  - Andrei Simion <andrei.simion@microchip.com>



description:

  The MCP16502 is an optimally integrated PMIC compatible

  with Microchip's eMPUs(Embedded Microprocessor Units),

  requiring Dynamic Voltage Scaling (DVS) with the use

  of High-Performance mode (HPM).



properties:

  compatible:

    const: microchip,mcp16502



  lpm-gpios:

    maxItems: 1

    description: GPIO for LPM pin.

      Note that this GPIO must remain high during

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



  reg:

    maxItems: 1



  regulators:

    type: object

    additionalProperties: false

    description: List of regulators and its properties.



    patternProperties:

      "^(VDD_(IO|CORE|DDR|OTHER)|LDO[1-2])$":

        type: object

        $ref: regulator.yaml#

        unevaluatedProperties: false



        properties:

          regulator-initial-mode:

            enum: [2, 4]

            default: 2

            description: Initial operating mode



          regulator-allowed-modes:

            items:

              enum: [2, 4]

            description: Supported modes

              2 - FPWM higher precision, higher consumption

              4 - AutoPFM lower precision, lower consumption



required:

  - compatible

  - reg

  - regulators



additionalProperties: false



examples:

  - |

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        pmic@5b {

            compatible = "microchip,mcp16502";

            reg = <0x5b>;



            regulators {

                VDD_IO {

                    regulator-name = "VDD_IO";

                    regulator-min-microvolt = <3300000>;

                    regulator-max-microvolt = <3300000>;

                    regulator-initial-mode = <2>;

                    regulator-allowed-modes = <2>, <4>;

                    regulator-always-on;



                    regulator-state-standby {

                        regulator-on-in-suspend;

                        regulator-mode = <4>;

                    };



                    regulator-state-mem {

                        regulator-off-in-suspend;

                        regulator-mode = <4>;

                    };

                };



                VDD_DDR {

                    regulator-name = "VDD_DDR";

                    regulator-min-microvolt = <1350000>;

                    regulator-max-microvolt = <1350000>;

                    regulator-initial-mode = <2>;

                    regulator-allowed-modes = <2>, <4>;

                    regulator-always-on;



                    regulator-state-standby {

                        regulator-on-in-suspend;

                        regulator-mode = <4>;

                    };



                    regulator-state-mem {

                        regulator-on-in-suspend;

                        regulator-mode = <4>;

                    };

                };



                VDD_CORE {

                    regulator-name = "VDD_CORE";

                    regulator-min-microvolt = <1150000>;

                    regulator-max-microvolt = <1150000>;

                    regulator-initial-mode = <2>;

                    regulator-allowed-modes = <2>, <4>;

                    regulator-always-on;



                    regulator-state-standby {

                        regulator-on-in-suspend;

                        regulator-mode = <4>;

                    };



                    regulator-state-mem {

                        regulator-off-in-suspend;

                        regulator-mode = <4>;

                    };

                };



                VDD_OTHER {

                    regulator-name = "VDD_OTHER";

                    regulator-min-microvolt = <1050000>;

                    regulator-max-microvolt = <1250000>;

                    regulator-initial-mode = <2>;

                    regulator-allowed-modes = <2>, <4>;

                    regulator-always-on;



                    regulator-state-standby {

                        regulator-on-in-suspend;

                        regulator-mode = <4>;

                    };



                    regulator-state-mem {

                        regulator-off-in-suspend;

                        regulator-mode = <4>;

                    };

                };



                LDO1 {

                    regulator-name = "LDO1";

                    regulator-min-microvolt = <1800000>;

                    regulator-max-microvolt = <1800000>;

                    regulator-always-on;



                    regulator-state-standby {

                        regulator-on-in-suspend;

                    };



                    regulator-state-mem {

                        regulator-off-in-suspend;

                    };

                };



                LDO2 {

                    regulator-name = "LDO2";

                    regulator-min-microvolt = <1200000>;

                    regulator-max-microvolt = <3700000>;

                    regulator-always-on;



                    regulator-state-standby {

                        regulator-on-in-suspend;

                    };



                    regulator-state-mem {

                        regulator-off-in-suspend;

                    };

                };

            };

        };

    };

Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml

+8 −2
Original line number Diff line number Diff line
@@ -19,8 +19,14 @@ allOf: 


properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - qcom,pm8150b-vbus-reg

      - items:

          - enum:

              - qcom,pm4125-vbus-reg

              - qcom,pm6150-vbus-reg

          - const: qcom,pm8150b-vbus-reg



  reg:

    maxItems: 1

Documentation/devicetree/bindings/regulator/ti,tps65132.yaml

0 → 100644
+84 −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/ti,tps65132.yaml#

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



title: TI TPS65132 Dual Output Power Regulators



maintainers:

  - devicetree@vger.kernel.org



description: |

  The TPS65132 is designed to supply positive/negative driven applications.



  Datasheet is available at:

  https://www.ti.com/lit/gpn/tps65132



properties:

  compatible:

    enum:

      - ti,tps65132



  reg:

    maxItems: 1



patternProperties:

  "^out[pn]$":

    type: object

    $ref: regulator.yaml#

    unevaluatedProperties: false

    description:

      Properties for single regulator.



    properties:

      enable-gpios:

        maxItems: 1

        description:

          GPIO specifier to enable the GPIO control (on/off) for regulator.



      active-discharge-gpios:

        maxItems: 1

        description:

          GPIO specifier to actively discharge the delay mechanism.



      ti,active-discharge-time-us:

        description: Regulator active discharge time in microseconds.



    dependencies:

      active-discharge-gpios: [ 'ti,active-discharge-time-us' ]



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    #include <dt-bindings/gpio/gpio.h>



    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        regulator@3e {

            compatible = "ti,tps65132";

            reg = <0x3e>;



            outp {

                regulator-name = "outp";

                regulator-boot-on;

                regulator-always-on;

                enable-gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;

            };



            outn {

                regulator-name = "outn";

                regulator-boot-on;

                regulator-always-on;

                regulator-active-discharge = <0>;

                enable-gpios = <&gpio 40 GPIO_ACTIVE_HIGH>;

            };

        };

    };