Skip to content

Commit d849557

Browse files
committed
Merge tag 'regulator-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator updates from Mark Brown: "A fairly quiet release, there were some cleanup and a couple of new devices but the biggest change was converting most of the drivers to use asynchronous probe. This allows us to ramp up multiple regulators in parallel during boot which can have a noticable impact on modern systems. Summary: - Update of drivers to PROBE_PREFER_ASYNCHRONOUS to mitigate issues with ramp times slowing down boots. - Convert to void remove callbacks. - Support for voltage monitoring on DA9063 - Support for Qualcomm PMC8180 and PMM8654au, Richtek RT4803 and RT5739, Rockchip RK860x" * tag 'regulator-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (46 commits) regulator: dt-bindings: qcom,rpmh: Combine PM6150L and PM8150L if-then regulator: core: Make regulator_lock_two() logic easier to follow regulator: dt-bindings: qcom,rpmh: Correct PM8550 family supplies regulator: stm32-pwr: fix of_iomap leak dt-bindings: mfd: dlg,da9063: document voltage monitoring regulator: da9063: implement setter for voltage monitoring regulator: da9063: add voltage monitoring registers regulator: fan53555: Add support for RK860X regulator: fan53555: Use dev_err_probe regulator: fan53555: Improve vsel_mask computation regulator: fan53555: Make use of the bit macros regulator: fan53555: Remove unused *_SLEW_SHIFT definitions regulator: dt-bindings: fcs,fan53555: Add support for RK860X regulator: qcom_smd: Add MP5496 S1 regulator regulator: qcom_smd: Add s1 sub-node to mp5496 regulator regulator: qcom,rpmh: add compatible for pmm8654au RPMH regulator: qcom-rpmh: add support for pmm8654au regulators regulator: core: Avoid lockdep reports when resolving supplies regulator: core: Consistently set mutex_owner when using ww_mutex_lock_slow() regulator: dt-bindings: qcom,rpmh: Add compatible for PMC8180 ...
2 parents f5468be + ed47990 commit d849557

224 files changed

Lines changed: 1475 additions & 271 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Documentation/devicetree/bindings/mfd/dlg,da9063.yaml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ maintainers:
1212
description: |
1313
For device-tree bindings of other sub-modules refer to the binding documents
1414
under the respective sub-system directories.
15+
Using regulator-{uv,ov}-{warn,error,protection}-microvolt requires special
16+
handling: First, when GP_FB2 is used, it must be ensured that there is no
17+
moment where all voltage monitors are disabled. Next, as da9063 only supports
18+
UV *and* OV monitoring, both must be set to the same severity and value
19+
(0: disable, 1: enable).
1520
1621
properties:
1722
compatible:
@@ -121,11 +126,19 @@ examples:
121126
regulator-max-microamp = <2000000>;
122127
regulator-boot-on;
123128
};
129+
ldo6 {
130+
/* UNUSED */
131+
regulator-name = "LDO_6";
132+
regulator-uv-protection-microvolt = <0>;
133+
regulator-ov-protection-microvolt = <0>;
134+
};
124135
ldo11 {
125136
regulator-name = "LDO_11";
126137
regulator-min-microvolt = <900000>;
127-
regulator-max-microvolt = <3600000>;
128-
regulator-boot-on;
138+
regulator-max-microvolt = <900000>;
139+
regulator-uv-protection-microvolt = <1>;
140+
regulator-ov-protection-microvolt = <1>;
141+
regulator-always-on;
129142
};
130143
};
131144
};

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ maintainers:
1010
- Ying-Chun Liu (PaulLiu) <paul.liu@linaro.org>
1111

1212
allOf:
13-
- $ref: "regulator.yaml#"
13+
- $ref: regulator.yaml#
1414

1515
properties:
1616
compatible:
@@ -19,43 +19,43 @@ properties:
1919
regulator-name: true
2020

2121
anatop-reg-offset:
22-
$ref: '/schemas/types.yaml#/definitions/uint32'
22+
$ref: /schemas/types.yaml#/definitions/uint32
2323
description: u32 value representing the anatop MFD register offset.
2424

2525
anatop-vol-bit-shift:
26-
$ref: '/schemas/types.yaml#/definitions/uint32'
26+
$ref: /schemas/types.yaml#/definitions/uint32
2727
description: u32 value representing the bit shift for the register.
2828

2929
anatop-vol-bit-width:
30-
$ref: '/schemas/types.yaml#/definitions/uint32'
30+
$ref: /schemas/types.yaml#/definitions/uint32
3131
description: u32 value representing the number of bits used in the register.
3232

3333
anatop-min-bit-val:
34-
$ref: '/schemas/types.yaml#/definitions/uint32'
34+
$ref: /schemas/types.yaml#/definitions/uint32
3535
description: u32 value representing the minimum value of this register.
3636

3737
anatop-min-voltage:
38-
$ref: '/schemas/types.yaml#/definitions/uint32'
38+
$ref: /schemas/types.yaml#/definitions/uint32
3939
description: u32 value representing the minimum voltage of this regulator.
4040

4141
anatop-max-voltage:
42-
$ref: '/schemas/types.yaml#/definitions/uint32'
42+
$ref: /schemas/types.yaml#/definitions/uint32
4343
description: u32 value representing the maximum voltage of this regulator.
4444

4545
anatop-delay-reg-offset:
46-
$ref: '/schemas/types.yaml#/definitions/uint32'
46+
$ref: /schemas/types.yaml#/definitions/uint32
4747
description: u32 value representing the anatop MFD step time register offset.
4848

4949
anatop-delay-bit-shift:
50-
$ref: '/schemas/types.yaml#/definitions/uint32'
50+
$ref: /schemas/types.yaml#/definitions/uint32
5151
description: u32 value representing the bit shift for the step time register.
5252

5353
anatop-delay-bit-width:
54-
$ref: '/schemas/types.yaml#/definitions/uint32'
54+
$ref: /schemas/types.yaml#/definitions/uint32
5555
description: u32 value representing the number of bits used in the step time register.
5656

5757
anatop-enable-bit:
58-
$ref: '/schemas/types.yaml#/definitions/uint32'
58+
$ref: /schemas/types.yaml#/definitions/uint32
5959
description: u32 value representing regulator enable bit offset.
6060

6161
vin-supply:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ properties:
109109
description: Specify a valid GPIO for platform control of the regulator
110110

111111
dlg,ripple-cancel:
112-
$ref: "/schemas/types.yaml#/definitions/uint32"
112+
$ref: /schemas/types.yaml#/definitions/uint32
113113
enum: [ 0, 1, 2, 3 ]
114114
description: |
115115
Defined in include/dt-bindings/regulator/dlg,da9121-regulator.h

Documentation/devicetree/bindings/regulator/fcs,fan53555.yaml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,21 @@ allOf:
1414

1515
properties:
1616
compatible:
17-
enum:
18-
- fcs,fan53555
19-
- fcs,fan53526
20-
- silergy,syr827
21-
- silergy,syr828
22-
- tcs,tcs4525
17+
oneOf:
18+
- enum:
19+
- fcs,fan53555
20+
- fcs,fan53526
21+
- rockchip,rk8600
22+
- rockchip,rk8602
23+
- silergy,syr827
24+
- silergy,syr828
25+
- tcs,tcs4525
26+
- items:
27+
- const: rockchip,rk8601
28+
- const: rockchip,rk8600
29+
- items:
30+
- const: rockchip,rk8603
31+
- const: rockchip,rk8602
2332

2433
reg:
2534
maxItems: 1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ description:
1717
to be the same.
1818

1919
allOf:
20-
- $ref: "regulator.yaml#"
20+
- $ref: regulator.yaml#
2121
- if:
2222
properties:
2323
compatible:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ description:
1414
regulator.yaml, can also be used.
1515

1616
allOf:
17-
- $ref: "regulator.yaml#"
17+
- $ref: regulator.yaml#
1818

1919
properties:
2020
compatible:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ description:
1515
regulator.txt, can also be used.
1616

1717
allOf:
18-
- $ref: "regulator.yaml#"
18+
- $ref: regulator.yaml#
1919

2020
properties:
2121
compatible:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ properties:
2525

2626
patternProperties:
2727
"^regulator-(ldo|sbb[0-2])$":
28-
$ref: "regulator.yaml#"
28+
$ref: regulator.yaml#
2929
unevaluatedProperties: false
3030

3131
required:

Documentation/devicetree/bindings/regulator/max8660.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ properties:
2525

2626
patternProperties:
2727
"^regulator-.+$":
28-
$ref: "regulator.yaml#"
28+
$ref: regulator.yaml#
2929
unevaluatedProperties: false
3030

3131
additionalProperties: false

Documentation/devicetree/bindings/regulator/max8893.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ properties:
2525

2626
patternProperties:
2727
"^(ldo[1-5]|buck)$":
28-
$ref: "regulator.yaml#"
28+
$ref: regulator.yaml#
2929

3030
additionalProperties: false
3131

0 commit comments

Comments
 (0)