Skip to content

Commit 584aecc

Browse files
committed
Merge tag 'regulator-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator updates from Mark Brown: "This s a very quiet release for the regulator API, we have a few new devices (most of which are just ID updates) and one new fairly specialist core feature for use in interrupt context. - An API allowing lockless enable/disable for regulators acquired in exclusive mode, for use in interrupt contexts - A rewrite of the MedaTek DVFSRC regulator driver which apparently never worked - Support for Mediaktek MT6312, Qualcomm QCA6390 and WCN7850, Renesas RZ/G2L USB VBUS regulator and ST Microelectronics STM32MP13" * tag 'regulator-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (26 commits) regulator: dt-bindings: pca9450: Make interrupt optional regulator: pca9450: Make IRQ optional dt-bindings: regulator: sprd,sc2731-regulator: convert to YAML regulator: max77857: Constify struct regmap_config regulator: da9121: Constify struct regmap_config dt-bindings: regulator: ti,tps65132: document VIN supply dt-bindings: mfd: twl: Fix example regulator: Add Renesas RZ/G2L USB VBUS regulator driver regulator: core: Add helper for allow HW access to enable/disable regulator regulator: Add bindings for MediaTek DVFSRC Regulators regulator: Add refactored mtk-dvfsrc-regulator driver regulator: Remove mtk-dvfsrc-regulator.c regulator: userspace-consumer: quiet device deferral regulator: dt-bindings: mt6315: Document MT6319 PMIC regulator: add missing MODULE_DESCRIPTION() macro dt-bindings: regulator: twl-regulator: convert to yaml regulator: dt-bindings: describe the PMU module of the WCN7850 package regulator: dt-bindings: describe the PMU module of the QCA6390 package regulator: dt-bindings: rtq2208: Add specified fixed LDO VOUT property regulator: rtq2208: Add fixed LDO VOUT property and check that matches the constraints ...
2 parents 25617a5 + ef0b29e commit 584aecc

44 files changed

Lines changed: 833 additions & 347 deletions

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/ti,twl.yaml

Lines changed: 165 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,32 @@ allOf:
2222
contains:
2323
const: ti,twl4030
2424
then:
25+
patternProperties:
26+
"^regulator-":
27+
properties:
28+
compatible:
29+
enum:
30+
- ti,twl4030-vaux1
31+
- ti,twl4030-vaux2
32+
- ti,twl4030-vaux3
33+
- ti,twl4030-vaux4
34+
- ti,twl4030-vmmc1
35+
- ti,twl4030-vmmc2
36+
- ti,twl4030-vpll1
37+
- ti,twl4030-vpll2
38+
- ti,twl4030-vsim
39+
- ti,twl4030-vdac
40+
- ti,twl4030-vintana2
41+
- ti,twl4030-vio
42+
- ti,twl4030-vdd1
43+
- ti,twl4030-vdd2
44+
- ti,twl4030-vintana1
45+
- ti,twl4030-vintdig
46+
- ti,twl4030-vusb1v5
47+
- ti,twl4030-vusb1v8
48+
- ti,twl4030-vusb3v1
49+
ti,retain-on-reset: false
50+
2551
properties:
2652
madc:
2753
type: object
@@ -50,13 +76,34 @@ allOf:
5076
properties:
5177
compatible:
5278
const: ti,twl4030-wdt
53-
5479
- if:
5580
properties:
5681
compatible:
5782
contains:
5883
const: ti,twl6030
5984
then:
85+
patternProperties:
86+
"^regulator-":
87+
properties:
88+
compatible:
89+
enum:
90+
- ti,twl6030-vaux1
91+
- ti,twl6030-vaux2
92+
- ti,twl6030-vaux3
93+
- ti,twl6030-vmmc
94+
- ti,twl6030-vpp
95+
- ti,twl6030-vusim
96+
- ti,twl6030-vana
97+
- ti,twl6030-vcxio
98+
- ti,twl6030-vdac
99+
- ti,twl6030-vusb
100+
- ti,twl6030-v1v8
101+
- ti,twl6030-v2v1
102+
- ti,twl6030-vdd1
103+
- ti,twl6030-vdd2
104+
- ti,twl6030-vdd3
105+
regulator-initial-mode: false
106+
60107
properties:
61108
gpadc:
62109
type: object
@@ -69,6 +116,25 @@ allOf:
69116
contains:
70117
const: ti,twl6032
71118
then:
119+
patternProperties:
120+
"^regulator-":
121+
properties:
122+
compatible:
123+
enum:
124+
- ti,twl6032-ldo1
125+
- ti,twl6032-ldo2
126+
- ti,twl6032-ldo3
127+
- ti,twl6032-ldo4
128+
- ti,twl6032-ldo5
129+
- ti,twl6032-ldo6
130+
- ti,twl6032-ldo7
131+
- ti,twl6032-ldoln
132+
- ti,twl6032-ldousb
133+
- ti,twl6032-smps3
134+
- ti,twl6032-smps4
135+
- ti,twl6032-vio
136+
regulator-initial-mode: false
137+
72138
properties:
73139
gpadc:
74140
type: object
@@ -112,6 +178,27 @@ properties:
112178
interrupts:
113179
maxItems: 1
114180

181+
patternProperties:
182+
"^regulator-":
183+
type: object
184+
unevaluatedProperties: false
185+
$ref: /schemas/regulator/regulator.yaml
186+
properties:
187+
compatible: true
188+
regulator-initial-mode:
189+
enum:
190+
- 0x08 # Sleep mode, the nominal output voltage is maintained
191+
# with low power consumption with low load current capability
192+
- 0x0e # Active mode, the regulator can deliver its nominal output
193+
# voltage with full-load current capability
194+
ti,retain-on-reset:
195+
description:
196+
Does not turn off the supplies during warm
197+
reset. Could be needed for VMMC, as TWL6030
198+
reset sequence for this signal does not comply
199+
with the SD specification.
200+
type: boolean
201+
115202
unevaluatedProperties: false
116203

117204
required:
@@ -131,9 +218,85 @@ examples:
131218
compatible = "ti,twl6030";
132219
reg = <0x48>;
133220
interrupts = <39>; /* IRQ_SYS_1N cascaded to gic */
221+
interrupt-parent = <&gic>;
134222
interrupt-controller;
135223
#interrupt-cells = <1>;
136-
interrupt-parent = <&gic>;
224+
225+
gpadc {
226+
compatible = "ti,twl6030-gpadc";
227+
interrupts = <6>;
228+
#io-channel-cells = <1>;
229+
};
230+
231+
rtc {
232+
compatible = "ti,twl4030-rtc";
233+
interrupts = <8>;
234+
};
235+
236+
regulator-vaux1 {
237+
compatible = "ti,twl6030-vaux1";
238+
regulator-min-microvolt = <1000000>;
239+
regulator-max-microvolt = <3000000>;
240+
};
241+
242+
regulator-vmmc1 {
243+
compatible = "ti,twl6030-vmmc";
244+
ti,retain-on-reset;
245+
};
137246
};
138247
};
139248
249+
- |
250+
i2c {
251+
#address-cells = <1>;
252+
#size-cells = <0>;
253+
254+
pmic@48 {
255+
compatible = "ti,twl4030";
256+
reg = <0x48>;
257+
interrupts = <7>; /* SYS_NIRQ cascaded to intc */
258+
interrupt-parent = <&intc>;
259+
interrupt-controller;
260+
#interrupt-cells = <1>;
261+
262+
bci {
263+
compatible = "ti,twl4030-bci";
264+
interrupts = <9>, <2>;
265+
bci3v1-supply = <&vusb3v1>;
266+
io-channels = <&twl_madc 11>;
267+
io-channel-names = "vac";
268+
};
269+
270+
twl_madc: madc {
271+
compatible = "ti,twl4030-madc";
272+
interrupts = <3>;
273+
#io-channel-cells = <1>;
274+
};
275+
276+
pwrbutton {
277+
compatible = "ti,twl4030-pwrbutton";
278+
interrupts = <8>;
279+
};
280+
281+
rtc {
282+
compatible = "ti,twl4030-rtc";
283+
interrupts = <11>;
284+
};
285+
286+
regulator-vaux1 {
287+
compatible = "ti,twl4030-vaux1";
288+
regulator-min-microvolt = <1000000>;
289+
regulator-max-microvolt = <3000000>;
290+
regulator-initial-mode = <0xe>;
291+
};
292+
293+
vusb3v1: regulator-vusb3v1 {
294+
compatible = "ti,twl4030-vusb3v1";
295+
};
296+
297+
watchdog {
298+
compatible = "ti,twl4030-wdt";
299+
};
300+
};
301+
};
302+
...
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/regulator/mediatek,mt6873-dvfsrc-regulator.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: MediaTek DVFSRC-controlled Regulators
8+
9+
description:
10+
The Dynamic Voltage and Frequency Scaling Resource Collector Regulators
11+
are controlled with votes to the DVFSRC hardware.
12+
13+
maintainers:
14+
- AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- mediatek,mt6873-dvfsrc-regulator
20+
- mediatek,mt8183-dvfsrc-regulator
21+
- mediatek,mt8192-dvfsrc-regulator
22+
- mediatek,mt8195-dvfsrc-regulator
23+
24+
dvfsrc-vcore:
25+
description: DVFSRC-controlled SoC Vcore regulator
26+
$ref: regulator.yaml#
27+
unevaluatedProperties: false
28+
29+
dvfsrc-vscp:
30+
description: DVFSRC-controlled System Control Processor regulator
31+
$ref: regulator.yaml#
32+
unevaluatedProperties: false
33+
34+
required:
35+
- compatible
36+
37+
anyOf:
38+
- required:
39+
- dvfsrc-vcore
40+
- required:
41+
- dvfsrc-vscp
42+
43+
additionalProperties: false

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ description: |
1616
1717
properties:
1818
compatible:
19-
const: mediatek,mt6315-regulator
19+
oneOf:
20+
- items:
21+
- const: mediatek,mt6319-regulator
22+
- const: mediatek,mt6315-regulator
23+
- const: mediatek,mt6315-regulator
2024

2125
reg:
2226
maxItems: 1

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ properties:
9696
required:
9797
- compatible
9898
- reg
99-
- interrupts
10099
- regulators
101100

102101
additionalProperties: false

0 commit comments

Comments
 (0)