Skip to content

Commit 44f7a37

Browse files
committed
Merge tag 'regulator-v7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator updates from Mark Brown: "This has been a very quiet update for the regulator API, the bulk of the diffstat is DT binding conversions and the most promient series in the changelog is Johan Hovold cleaning up some leaks of OF nodes. For some reason we have had several different people sending improvements to better describe the parent supplies for existing regulators, these look to be independent efforts. The only new hardware support is for some Motorola custom varints of cpcap" * tag 'regulator-v7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (35 commits) regulator: max77620: drop redundant OF node initialisation regulator: bq257xx: Make OTG enable GPIO really optional regulator: bq257xx: Remove reference to the parent MFD's dev regulator: bd9571mwv: fix OF node reference imbalance regulator: act8945a: fix OF node reference imbalance regulator: s2dos05: fix OF node reference imbalance regulator: mt6357: fix OF node reference imbalance regulator: max77650: fix OF node reference imbalance regulator: rk808: fix OF node reference imbalance regulator: bq257xx: fix OF node reference imbalance regulator: dt-bindings: qcom,qca6390-pmu: Document WCN6755 PMU regulator: dt-bindings: regulator-max77620: convert to DT schema regulator: mt6315: Add regulator supplies regulator: dt-bindings: mt6315: Add regulator supplies regulator: devres: Use enum regulator_get_type in internal functions regulator: dt-bindings: mps,mp8859: convert to DT schema regulator: da9121: Allow caching BUCK registers regulator: dt-bindings: dlg,da9121: Add dlg,no-gpio-control regulator: cros-ec: Add regulator supply regulator: dt-bindings: cros-ec: Add regulator supply ...
2 parents 8e25831 + 606c780 commit 44f7a37

34 files changed

Lines changed: 518 additions & 347 deletions

Documentation/devicetree/bindings/mfd/spacemit,p1.yaml

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,41 @@ properties:
2727
interrupts:
2828
maxItems: 1
2929

30-
vin-supply:
31-
description: Input supply phandle.
30+
vin1-supply:
31+
description:
32+
Power supply for BUCK1. Required if BUCK1 is defined.
33+
34+
vin2-supply:
35+
description:
36+
Power supply for BUCK2. Required if BUCK2 is defined.
37+
38+
vin3-supply:
39+
description:
40+
Power supply for BUCK3. Required if BUCK3 is defined.
41+
42+
vin4-supply:
43+
description:
44+
Power supply for BUCK4. Required if BUCK4 is defined.
45+
46+
vin5-supply:
47+
description:
48+
Power supply for BUCK5. Required if BUCK5 is defined.
49+
50+
vin6-supply:
51+
description:
52+
Power supply for BUCK6. Required if BUCK6 is defined.
53+
54+
aldoin-supply:
55+
description:
56+
Power supply for ALDO1-4. Required if any are defined.
57+
58+
dldoin1-supply:
59+
description:
60+
Power supply for DLDO1-4. Required if any are defined.
61+
62+
dldoin2-supply:
63+
description:
64+
Power supply for DLDO5-7. Required if any are defined.
3265

3366
regulators:
3467
type: object
@@ -58,6 +91,10 @@ examples:
5891
compatible = "spacemit,p1";
5992
reg = <0x41>;
6093
interrupts = <64>;
94+
vin1-supply = <&reg_vcc_5v>;
95+
vin5-supply = <&reg_vcc_5v>;
96+
aldoin-supply = <&reg_vcc_5v>;
97+
dldoin1-supply = <&buck5>;
6198
6299
regulators {
63100
buck1 {
@@ -68,6 +105,14 @@ examples:
68105
regulator-always-on;
69106
};
70107
108+
buck5: buck5 {
109+
regulator-name = "buck5";
110+
regulator-min-microvolt = <500000>;
111+
regulator-max-microvolt = <3450000>;
112+
regulator-ramp-delay = <5000>;
113+
regulator-always-on;
114+
};
115+
71116
aldo1 {
72117
regulator-name = "aldo1";
73118
regulator-min-microvolt = <500000>;

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

Lines changed: 0 additions & 35 deletions
This file was deleted.

Documentation/devicetree/bindings/regulator/dlg,da9121.yaml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,14 @@ properties:
8181
Specify the polling period, measured in milliseconds, between interrupt status
8282
update checks. Range 1000-10000 ms.
8383
84+
dlg,no-gpio-control:
85+
type: boolean
86+
description: |
87+
Available GPIO input pins of the regulator are strapped to fixed levels, therefore
88+
GPIO configurable input functions, DVC/RELOAD/EN, cannot dynamically update BUCK
89+
registers. GPIO pins connected as output pins are not required to be strapped to a
90+
fixed level. Not allowed together with enable-gpios.
91+
8492
regulators:
8593
type: object
8694
additionalProperties: false
@@ -134,6 +142,17 @@ allOf:
134142
properties:
135143
buck2: false
136144

145+
- if:
146+
required:
147+
- dlg,no-gpio-control
148+
then:
149+
properties:
150+
regulators:
151+
patternProperties:
152+
"^buck([1-2])$":
153+
properties:
154+
enable-gpios: false
155+
137156
additionalProperties: false
138157

139158
examples:
@@ -168,6 +187,36 @@ examples:
168187
};
169188
};
170189
190+
- |
191+
#include <dt-bindings/interrupt-controller/irq.h>
192+
#include <dt-bindings/regulator/dlg,da9121-regulator.h>
193+
i2c {
194+
#address-cells = <1>;
195+
#size-cells = <0>;
196+
pmic@68 {
197+
compatible = "dlg,da9121";
198+
reg = <0x68>;
199+
200+
interrupt-parent = <&gpio6>;
201+
interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
202+
203+
dlg,irq-polling-delay-passive-ms = <2000>;
204+
dlg,no-gpio-control;
205+
206+
regulators {
207+
DA9121_BUCK: buck1 {
208+
regulator-name = "BUCK1";
209+
regulator-min-microvolt = <300000>;
210+
regulator-max-microvolt = <1900000>;
211+
regulator-min-microamp = <7000000>;
212+
regulator-max-microamp = <20000000>;
213+
regulator-boot-on;
214+
regulator-initial-mode = <DA9121_BUCK_MODE_AUTO>;
215+
};
216+
};
217+
};
218+
};
219+
171220
- |
172221
#include <dt-bindings/gpio/gpio.h>
173222
#include <dt-bindings/interrupt-controller/irq.h>

Documentation/devicetree/bindings/regulator/fitipower,fp9931.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ properties:
6666
required:
6767
- compatible
6868
- reg
69+
- vin-supply
6970
- pg-gpios
7071
- enable-gpios
7172

Documentation/devicetree/bindings/regulator/google,cros-ec-regulator.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ properties:
2424
maxItems: 1
2525
description: Identifier for the voltage regulator to ChromeOS EC.
2626

27+
vin-supply:
28+
description: Input supply phandle
29+
2730
required:
2831
- compatible
2932
- reg
@@ -48,6 +51,7 @@ examples:
4851
regulator-min-microvolt = <1800000>;
4952
regulator-max-microvolt = <3300000>;
5053
reg = <0>;
54+
vin-supply = <&pp4200_s5>;
5155
};
5256
};
5357
};
Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/regulator/maxim,max77620-regulator.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Regulator for MAX77620 Power management IC from Maxim Semiconductor.
8+
9+
maintainers:
10+
- Svyatoslav Ryhel <clamor95@gmail.com>
11+
12+
description:
13+
Device has multiple DCDC(sd[0-3]) and LDOs(ldo[0-8]). The input supply
14+
of these regulators are defined under parent device node. Details of
15+
regulator properties are defined as child node under sub-node "regulators"
16+
which is child node of device node.
17+
18+
patternProperties:
19+
"^in-(sd[0-3]|ldo(0-1|2|3-5|4-6|7-8))-supply$":
20+
$ref: /schemas/types.yaml#/definitions/phandle
21+
description: Input supply for DCDC or LDO
22+
23+
"^(sd[0-3]|ldo[0-8])$":
24+
type: object
25+
$ref: /schemas/regulator/regulator.yaml#
26+
unevaluatedProperties: false
27+
28+
properties:
29+
maxim,active-fps-source:
30+
$ref: /schemas/types.yaml#/definitions/uint32
31+
description: |
32+
FPS source for the GPIOs to get enabled/disabled when system is in
33+
active state. Valid values are:
34+
- MAX77620_FPS_SRC_0: FPS source is FPS0.
35+
- MAX77620_FPS_SRC_1: FPS source is FPS1
36+
- MAX77620_FPS_SRC_2: FPS source is FPS2
37+
- MAX77620_FPS_SRC_NONE: GPIO is not controlled by FPS events and
38+
it gets enabled/disabled by register access.
39+
Absence of this property will leave the FPS configuration register
40+
for that GPIO to default configuration.
41+
42+
maxim,active-fps-power-up-slot:
43+
$ref: /schemas/types.yaml#/definitions/uint32
44+
description:
45+
Sequencing event slot number on which the GPIO get enabled when
46+
master FPS input event set to HIGH. This is applicable if FPS source
47+
is selected as FPS0, FPS1 or FPS2.
48+
enum: [0, 1, 2, 3, 4, 5, 6, 7]
49+
50+
maxim,active-fps-power-down-slot:
51+
$ref: /schemas/types.yaml#/definitions/uint32
52+
description:
53+
Sequencing event slot number on which the GPIO get disabled when
54+
master FPS input event set to LOW. This is applicable if FPS source
55+
is selected as FPS0, FPS1 or FPS2.
56+
enum: [0, 1, 2, 3, 4, 5, 6, 7]
57+
58+
maxim,suspend-fps-source:
59+
$ref: /schemas/types.yaml#/definitions/uint32
60+
description:
61+
This is same as property "maxim,active-fps-source" but value get
62+
configured when system enters in to suspend state.
63+
64+
maxim,suspend-fps-power-up-slot:
65+
$ref: /schemas/types.yaml#/definitions/uint32
66+
description:
67+
This is same as property "maxim,active-fps-power-up-slot" but this
68+
value get configured into FPS configuration register when system
69+
enters into suspend. This is applicable if suspend state FPS source
70+
is selected as FPS0, FPS1 or FPS2.
71+
enum: [0, 1, 2, 3, 4, 5, 6, 7]
72+
73+
maxim,suspend-fps-power-down-slot:
74+
$ref: /schemas/types.yaml#/definitions/uint32
75+
description:
76+
This is same as property "maxim,active-fps-power-down-slot" but this
77+
value get configured into FPS configuration register when system
78+
enters into suspend. This is applicable if suspend state FPS source
79+
is selected as FPS0, FPS1 or FPS2.
80+
enum: [0, 1, 2, 3, 4, 5, 6, 7]
81+
82+
maxim,ramp-rate-setting:
83+
$ref: /schemas/types.yaml#/definitions/uint32
84+
description: |
85+
Ramp rate(uV/us) setting to be configured to the device. The platform
86+
may have different ramp rate than advertised ramp rate if it has design
87+
variation from Maxim's recommended. On this case, platform specific
88+
ramp rate is used for ramp time calculation and this property is used
89+
for device register configurations. The measured ramp rate of platform
90+
is provided by the regulator-ramp-delay.
91+
92+
Maxim Max77620 supports following ramp delay:
93+
SD: 13.75mV/us, 27.5mV/us, 55mV/us
94+
LDOs: 5mV/us, 100mV/us
95+
enum: [5000, 13750, 27500, 55000, 100000]
96+
97+
additionalProperties: false
98+
99+
# see maxim,max77620.yaml for an example
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/regulator/motorola,cpcap-regulator.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Motorola CPCAP PMIC regulators
8+
9+
maintainers:
10+
- Svyatoslav Ryhel <clamor95@gmail.com>
11+
12+
description:
13+
This module is part of the Motorola CPCAP MFD device. For more details
14+
see Documentation/devicetree/bindings/mfd/motorola,cpcap.yaml. The
15+
regulator controller is represented as a sub-node of the PMIC node
16+
on the device tree.
17+
18+
properties:
19+
compatible:
20+
enum:
21+
- motorola,cpcap-regulator
22+
- motorola,mapphone-cpcap-regulator
23+
- motorola,mot-cpcap-regulator
24+
- motorola,xoom-cpcap-regulator
25+
26+
regulators:
27+
type: object
28+
29+
patternProperties:
30+
"^(SW[1-6]|V(CAM|CSI|DAC|DIG|FUSE|HVIO|SDIO|PLL|RF[12]|RFREF|WLAN[12]|SIM|SIMCARD|VIB|USB|AUDIO))$":
31+
$ref: /schemas/regulator/regulator.yaml#
32+
type: object
33+
34+
required:
35+
- regulator-name
36+
- regulator-enable-ramp-delay
37+
- regulator-min-microvolt
38+
- regulator-max-microvolt
39+
40+
unevaluatedProperties: false
41+
42+
required:
43+
- compatible
44+
45+
additionalProperties: false
46+
47+
...

Documentation/devicetree/bindings/regulator/mp8859.txt

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)