forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'regulator-v5.1' of git://git.kernel.org/pub/scm/linux/kern…
…el/git/broonie/regulator
Pull regulator updates from Mark Brown:
"The bulk of the standout changes in this release are cleanups, with
the core work being a combination of factoring out common code into
helpers and the completion of the conversion of the core to use GPIO
descriptors.
Summary:
- Addition of helper functions for current limits and conversion of
drivers to use them by Axel Lin.
- Lots and lots of cleanups from Axel Lin.
- Conversion of the core to use GPIO descriptors rather than numbers
by Linus Walleij.
- New drivers for Maxim MAX77650 and ROHM BD70528"
* tag 'regulator-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (131 commits)
regulator: mc13xxx: Constify regulator_ops variables
regulator: palmas: Constify palmas_smps_ramp_delay array
regulator: wm831x-dcdc: Convert to use regulator_set/get_current_limit_regmap
regulator: pv88090: Convert to use regulator_set/get_current_limit_regmap
regulator: pv88080: Convert to use regulator_set/get_current_limit_regmap
regulator: pv88060: Convert to use regulator_set/get_current_limit_regmap
regulator: max77650: Convert to use regulator_set/get_current_limit_regmap
regulator: lp873x: Convert to use regulator_set/get_current_limit_regmap
regulator: lp872x: Convert to use regulator_set/get_current_limit_regmap
regulator: da9210: Convert to use regulator_set/get_current_limit_regmap
regulator: da9055: Convert to use regulator_set/get_current_limit_regmap
regulator: core: Add set/get_current_limit helpers for regmap users
regulator: Fix comment for csel_reg and csel_mask
regulator: stm32-vrefbuf: add power management support
regulator: 88pm8607: Remove unused fields from struct pm8607_regulator_info
regulator: 88pm8607: Simplify pm8607_list_voltage implementation
regulator: cpcap: Constify omap4_regulators and xoom_regulators
regulator: cpcap: Remove unused vsel_shift from struct cpcap_regulator
dt-bindings: regulator: tps65218: rectify units of LS3
dt-bindings: regulator: add LS2 load switch documentation
...- Loading branch information
Showing
94 changed files
with
2,489 additions
and
1,521 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -123,6 +123,7 @@ Mark Brown <[email protected]> | |
| Mark Yao <[email protected]> <[email protected]> | ||
| Martin Kepplinger <[email protected]> <[email protected]> | ||
| Martin Kepplinger <[email protected]> <[email protected]> | ||
| Mathieu Othacehe <[email protected]> | ||
| Matthew Wilcox <[email protected]> <[email protected]> | ||
| Matthew Wilcox <[email protected]> <[email protected]> | ||
| Matthew Wilcox <[email protected]> <[email protected]> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 0 additions & 35 deletions
35
Documentation/devicetree/bindings/regulator/fixed-regulator.txt
This file was deleted.
Oops, something went wrong.
67 changes: 67 additions & 0 deletions
67
Documentation/devicetree/bindings/regulator/fixed-regulator.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| # SPDX-License-Identifier: GPL-2.0 | ||
| %YAML 1.2 | ||
| --- | ||
| $id: http://devicetree.org/schemas/regulator/fixed-regulator.yaml# | ||
| $schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
|
||
| title: Fixed Voltage regulators | ||
|
|
||
| maintainers: | ||
| - Liam Girdwood <[email protected]> | ||
| - Mark Brown <[email protected]> | ||
|
|
||
| description: | ||
| Any property defined as part of the core regulator binding, defined in | ||
| regulator.txt, can also be used. However a fixed voltage regulator is | ||
| expected to have the regulator-min-microvolt and regulator-max-microvolt | ||
| to be the same. | ||
|
|
||
| properties: | ||
| compatible: | ||
| const: regulator-fixed | ||
|
|
||
| regulator-name: true | ||
|
|
||
| gpio: | ||
| description: gpio to use for enable control | ||
| maxItems: 1 | ||
|
|
||
| startup-delay-us: | ||
| description: startup time in microseconds | ||
| $ref: /schemas/types.yaml#/definitions/uint32 | ||
|
|
||
| enable-active-high: | ||
| description: | ||
| Polarity of GPIO is Active high. If this property is missing, | ||
| the default assumed is Active low. | ||
| type: boolean | ||
|
|
||
| gpio-open-drain: | ||
| description: | ||
| GPIO is open drain type. If this property is missing then default | ||
| assumption is false. | ||
| type: boolean | ||
|
|
||
| vin-supply: | ||
| description: Input supply phandle. | ||
| $ref: /schemas/types.yaml#/definitions/phandle | ||
|
|
||
| required: | ||
| - compatible | ||
| - regulator-name | ||
|
|
||
| examples: | ||
| - | | ||
| reg_1v8: regulator-1v8 { | ||
| compatible = "regulator-fixed"; | ||
| regulator-name = "1v8"; | ||
| regulator-min-microvolt = <1800000>; | ||
| regulator-max-microvolt = <1800000>; | ||
| gpio = <&gpio1 16 0>; | ||
| startup-delay-us = <70000>; | ||
| enable-active-high; | ||
| regulator-boot-on; | ||
| gpio-open-drain; | ||
| vin-supply = <&parent_reg>; | ||
| }; | ||
| ... |
41 changes: 41 additions & 0 deletions
41
Documentation/devicetree/bindings/regulator/max77650-regulator.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| Regulator driver for MAX77650 PMIC from Maxim Integrated. | ||
|
|
||
| This module is part of the MAX77650 MFD device. For more details | ||
| see Documentation/devicetree/bindings/mfd/max77650.txt. | ||
|
|
||
| The regulator controller is represented as a sub-node of the PMIC node | ||
| on the device tree. | ||
|
|
||
| The device has a single LDO regulator and a SIMO buck-boost regulator with | ||
| three independent power rails. | ||
|
|
||
| Required properties: | ||
| -------------------- | ||
| - compatible: Must be "maxim,max77650-regulator" | ||
|
|
||
| Each rail must be instantiated under the regulators subnode of the top PMIC | ||
| node. Up to four regulators can be defined. For standard regulator properties | ||
| refer to Documentation/devicetree/bindings/regulator/regulator.txt. | ||
|
|
||
| Available regulator compatible strings are: "ldo", "sbb0", "sbb1", "sbb2". | ||
|
|
||
| Example: | ||
| -------- | ||
|
|
||
| regulators { | ||
| compatible = "maxim,max77650-regulator"; | ||
|
|
||
| max77650_ldo: regulator@0 { | ||
| regulator-compatible = "ldo"; | ||
| regulator-name = "max77650-ldo"; | ||
| regulator-min-microvolt = <1350000>; | ||
| regulator-max-microvolt = <2937500>; | ||
| }; | ||
|
|
||
| max77650_sbb0: regulator@1 { | ||
| regulator-compatible = "sbb0"; | ||
| regulator-name = "max77650-sbb0"; | ||
| regulator-min-microvolt = <800000>; | ||
| regulator-max-microvolt = <1587500>; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
Documentation/devicetree/bindings/regulator/rohm,bd70528-regulator.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| ROHM BD70528 Power Management Integrated Circuit regulator bindings | ||
|
|
||
| Required properties: | ||
| - regulator-name: should be "buck1", "buck2", "buck3", "ldo1", "ldo2", "ldo3", | ||
| "led_ldo1", "led_ldo2" | ||
|
|
||
| List of regulators provided by this controller. BD70528 regulators node | ||
| should be sub node of the BD70528 MFD node. See BD70528 MFD bindings at | ||
| Documentation/devicetree/bindings/mfd/rohm,bd70528-pmic.txt | ||
|
|
||
| The valid names for BD70528 regulator nodes are: | ||
| BUCK1, BUCK2, BUCK3, LDO1, LDO2, LDO3, LED_LDO1, LED_LDO2 | ||
|
|
||
| Optional properties: | ||
| - Any optional property defined in bindings/regulator/regulator.txt | ||
|
|
||
| Example: | ||
| regulators { | ||
| buck1: BUCK1 { | ||
| regulator-name = "buck1"; | ||
| regulator-min-microvolt = <1200000>; | ||
| regulator-max-microvolt = <3400000>; | ||
| regulator-boot-on; | ||
| regulator-ramp-delay = <125>; | ||
| }; | ||
| buck2: BUCK2 { | ||
| regulator-name = "buck2"; | ||
| regulator-min-microvolt = <1200000>; | ||
| regulator-max-microvolt = <3300000>; | ||
| regulator-boot-on; | ||
| regulator-ramp-delay = <125>; | ||
| }; | ||
| buck3: BUCK3 { | ||
| regulator-name = "buck3"; | ||
| regulator-min-microvolt = <800000>; | ||
| regulator-max-microvolt = <1800000>; | ||
| regulator-boot-on; | ||
| regulator-ramp-delay = <250>; | ||
| }; | ||
| ldo1: LDO1 { | ||
| regulator-name = "ldo1"; | ||
| regulator-min-microvolt = <1650000>; | ||
| regulator-max-microvolt = <3300000>; | ||
| regulator-boot-on; | ||
| }; | ||
| ldo2: LDO2 { | ||
| regulator-name = "ldo2"; | ||
| regulator-min-microvolt = <1650000>; | ||
| regulator-max-microvolt = <3300000>; | ||
| regulator-boot-on; | ||
| }; | ||
|
|
||
| ldo3: LDO3 { | ||
| regulator-name = "ldo3"; | ||
| regulator-min-microvolt = <1650000>; | ||
| regulator-max-microvolt = <3300000>; | ||
| }; | ||
| led_ldo1: LED_LDO1 { | ||
| regulator-name = "led_ldo1"; | ||
| regulator-min-microvolt = <200000>; | ||
| regulator-max-microvolt = <300000>; | ||
| }; | ||
| led_ldo2: LED_LDO2 { | ||
| regulator-name = "led_ldo2"; | ||
| regulator-min-microvolt = <200000>; | ||
| regulator-max-microvolt = <300000>; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.