Skip to content

Commit 6df9280

Browse files
torvaldstorvalds
committed
Merge tag 'regulator-v6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator updates from Mark Brown: "This release is almost all cleanup work of various kinds, while the diffstat for the core is quite large this is almost all cleanups and documentation improvments with some small fixes rather than any new feature work. We do have support for a couple of new devices but these are small additions to existing drivers rather than new drivers. - Removal of the SM5703 driver which does not have it's dependencies available. - Support for Allwinner AXP717, and Qualcomm WCN6855. The Allwinner support shares some commits with the MFD tree" * tag 'regulator-v6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (66 commits) regulator: sm5703: Remove because it is unused and fails to build regulator: Split up _regulator_get() regulator: update some comments ([gs]et_voltage_vsel vs [gs]et_voltage_sel) regulator: max8973: Use irq_get_trigger_type() helper regulator: core: fix the broken behavior of regulator_dev_lookup() regulator: max77650: Use container_of and constify static data regulator: hi6421v530: Use container_of and constify static data regulator: hi6421v530: Drop unused 'eco_microamp' regulator: qcom-refgen: Constify static data regulator: pfuze100: Constify static data regulator: pcap: Constify static data regulator: mtk-dvfsrc: Constify static data regulator: max77826: Constify static data regulator: max77826: Drop unused 'rdesc' in 'struct max77826_regulator_info' regulator: tps65023: Constify static data regulator: hi6421v600: Constify static data regulator: hi6421: Constify static data regulator: da9121: Constify static data regulator: da9063: Constify static data regulator: da9055: Constify static data ...
2 parents 9179b73 + 4591a22 commit 6df9280

Some content is hidden

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

58 files changed

+809
-818
lines changed

‎Documentation/devicetree/bindings/mfd/x-powers,axp152.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ properties:
274274
Defines the work frequency of DC-DC in kHz.
275275
276276
patternProperties:
277-
"^(([a-f])?ldo[0-9]|dcdc[0-7a-e]|ldo(_|-)io(0|1)|(dc1)?sw|rtc(_|-)ldo|cpusldo|drivevbus|dc5ldo)$":
277+
"^(([a-f])?ldo[0-9]|dcdc[0-7a-e]|ldo(_|-)io(0|1)|(dc1)?sw|rtc(_|-)ldo|cpusldo|drivevbus|dc5ldo|boost)$":
278278
$ref: /schemas/regulator/regulator.yaml#
279279
type: object
280280
unevaluatedProperties: false

‎Documentation/devicetree/bindings/regulator/mediatek,mt6397-regulator.yaml

Lines changed: 238 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,238 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/regulator/mediatek,mt6397-regulator.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: MediaTek MT6397 Regulator
8+
9+
maintainers:
10+
- Sen Chu <[email protected]>
11+
- Macpaul Lin <[email protected]>
12+
13+
description:
14+
Regulator node of the PMIC. This node should under the PMIC's device node.
15+
All voltage regulators provided by the PMIC are described as sub-nodes of
16+
this node.
17+
18+
properties:
19+
compatible:
20+
items:
21+
- const: mediatek,mt6397-regulator
22+
23+
patternProperties:
24+
"^(buck_)?v(core|drm|gpu|io18|pca(7|15)|sramca(7|15))$":
25+
description: Buck regulators
26+
type: object
27+
$ref: regulator.yaml#
28+
properties:
29+
regulator-allowed-modes:
30+
description: |
31+
BUCK regulators can set regulator-initial-mode and regulator-allowed-modes to
32+
values specified in dt-bindings/regulator/mediatek,mt6397-regulator.h
33+
items:
34+
enum: [0, 1]
35+
unevaluatedProperties: false
36+
37+
"^(ldo_)?v(tcxo|(a|io)28)$":
38+
description: LDOs with fixed 2.8V output and 0~100/10mV tuning
39+
type: object
40+
$ref: regulator.yaml#
41+
properties:
42+
regulator-allowed-modes: false
43+
unevaluatedProperties: false
44+
45+
"^(ldo_)?vusb$":
46+
description: LDOs with fixed 3.0V output and 0~100/10mV tuning
47+
type: object
48+
$ref: regulator.yaml#
49+
properties:
50+
regulator-allowed-modes: false
51+
unevaluatedProperties: false
52+
53+
"^(ldo_)?v(cama|emc3v3|gp[123456]|ibr|mc|mch)$":
54+
description: LDOs with variable output and 0~100/10mV tuning
55+
type: object
56+
$ref: regulator.yaml#
57+
properties:
58+
regulator-allowed-modes: false
59+
unevaluatedProperties: false
60+
61+
required:
62+
- compatible
63+
64+
additionalProperties: false
65+
66+
examples:
67+
- |
68+
#include <dt-bindings/interrupt-controller/arm-gic.h>
69+
70+
mt6397_regulators: regulators {
71+
compatible = "mediatek,mt6397-regulator";
72+
73+
mt6397_vpca15_reg: buck_vpca15 {
74+
regulator-name = "vpca15";
75+
regulator-min-microvolt = < 850000>;
76+
regulator-max-microvolt = <1350000>;
77+
regulator-ramp-delay = <12500>;
78+
regulator-enable-ramp-delay = <200>;
79+
};
80+
81+
mt6397_vpca7_reg: buck_vpca7 {
82+
regulator-name = "vpca7";
83+
regulator-min-microvolt = < 850000>;
84+
regulator-max-microvolt = <1350000>;
85+
regulator-ramp-delay = <12500>;
86+
regulator-enable-ramp-delay = <115>;
87+
};
88+
89+
mt6397_vsramca15_reg: buck_vsramca15 {
90+
regulator-name = "vsramca15";
91+
regulator-min-microvolt = < 850000>;
92+
regulator-max-microvolt = <1350000>;
93+
regulator-ramp-delay = <12500>;
94+
regulator-enable-ramp-delay = <115>;
95+
};
96+
97+
mt6397_vsramca7_reg: buck_vsramca7 {
98+
regulator-name = "vsramca7";
99+
regulator-min-microvolt = < 850000>;
100+
regulator-max-microvolt = <1350000>;
101+
regulator-ramp-delay = <12500>;
102+
regulator-enable-ramp-delay = <115>;
103+
};
104+
105+
mt6397_vcore_reg: buck_vcore {
106+
regulator-name = "vcore";
107+
regulator-min-microvolt = < 850000>;
108+
regulator-max-microvolt = <1350000>;
109+
regulator-ramp-delay = <12500>;
110+
regulator-enable-ramp-delay = <115>;
111+
};
112+
113+
mt6397_vgpu_reg: buck_vgpu {
114+
regulator-name = "vgpu";
115+
regulator-min-microvolt = < 700000>;
116+
regulator-max-microvolt = <1350000>;
117+
regulator-ramp-delay = <12500>;
118+
regulator-enable-ramp-delay = <115>;
119+
};
120+
121+
mt6397_vdrm_reg: buck_vdrm {
122+
regulator-name = "vdrm";
123+
regulator-min-microvolt = < 800000>;
124+
regulator-max-microvolt = <1400000>;
125+
regulator-ramp-delay = <12500>;
126+
regulator-enable-ramp-delay = <500>;
127+
};
128+
129+
mt6397_vio18_reg: buck_vio18 {
130+
regulator-name = "vio18";
131+
regulator-min-microvolt = <1500000>;
132+
regulator-max-microvolt = <2120000>;
133+
regulator-ramp-delay = <12500>;
134+
regulator-enable-ramp-delay = <500>;
135+
};
136+
137+
mt6397_vtcxo_reg: ldo_vtcxo {
138+
regulator-name = "vtcxo";
139+
regulator-min-microvolt = <2800000>;
140+
regulator-max-microvolt = <2800000>;
141+
regulator-enable-ramp-delay = <90>;
142+
};
143+
144+
mt6397_va28_reg: ldo_va28 {
145+
regulator-name = "va28";
146+
/* fixed output 2.8 V */
147+
regulator-enable-ramp-delay = <218>;
148+
};
149+
150+
mt6397_vcama_reg: ldo_vcama {
151+
regulator-name = "vcama";
152+
regulator-min-microvolt = <1500000>;
153+
regulator-max-microvolt = <2800000>;
154+
regulator-enable-ramp-delay = <218>;
155+
};
156+
157+
mt6397_vio28_reg: ldo_vio28 {
158+
regulator-name = "vio28";
159+
/* fixed output 2.8 V */
160+
regulator-enable-ramp-delay = <240>;
161+
};
162+
163+
mt6397_usb_reg: ldo_vusb {
164+
regulator-name = "vusb";
165+
/* fixed output 3.3 V */
166+
regulator-enable-ramp-delay = <218>;
167+
};
168+
169+
mt6397_vmc_reg: ldo_vmc {
170+
regulator-name = "vmc";
171+
regulator-min-microvolt = <1800000>;
172+
regulator-max-microvolt = <3300000>;
173+
regulator-enable-ramp-delay = <218>;
174+
};
175+
176+
mt6397_vmch_reg: ldo_vmch {
177+
regulator-name = "vmch";
178+
regulator-min-microvolt = <3000000>;
179+
regulator-max-microvolt = <3300000>;
180+
regulator-enable-ramp-delay = <218>;
181+
};
182+
183+
mt6397_vemc_3v3_reg: ldo_vemc3v3 {
184+
regulator-name = "vemc_3v3";
185+
regulator-min-microvolt = <3000000>;
186+
regulator-max-microvolt = <3300000>;
187+
regulator-enable-ramp-delay = <218>;
188+
};
189+
190+
mt6397_vgp1_reg: ldo_vgp1 {
191+
regulator-name = "vcamd";
192+
regulator-min-microvolt = <1220000>;
193+
regulator-max-microvolt = <3300000>;
194+
regulator-enable-ramp-delay = <240>;
195+
};
196+
197+
mt6397_vgp2_reg: ldo_vgp2 {
198+
regulator-name = "vcamio";
199+
regulator-min-microvolt = <1000000>;
200+
regulator-max-microvolt = <3300000>;
201+
regulator-enable-ramp-delay = <218>;
202+
};
203+
204+
mt6397_vgp3_reg: ldo_vgp3 {
205+
regulator-name = "vcamaf";
206+
regulator-min-microvolt = <1200000>;
207+
regulator-max-microvolt = <3300000>;
208+
regulator-enable-ramp-delay = <218>;
209+
};
210+
211+
mt6397_vgp4_reg: ldo_vgp4 {
212+
regulator-name = "vgp4";
213+
regulator-min-microvolt = <1200000>;
214+
regulator-max-microvolt = <3300000>;
215+
regulator-enable-ramp-delay = <218>;
216+
};
217+
218+
mt6397_vgp5_reg: ldo_vgp5 {
219+
regulator-name = "vgp5";
220+
regulator-min-microvolt = <1200000>;
221+
regulator-max-microvolt = <3000000>;
222+
regulator-enable-ramp-delay = <218>;
223+
};
224+
225+
mt6397_vgp6_reg: ldo_vgp6 {
226+
regulator-name = "vgp6";
227+
regulator-min-microvolt = <1200000>;
228+
regulator-max-microvolt = <3300000>;
229+
regulator-enable-ramp-delay = <218>;
230+
};
231+
232+
mt6397_vibr_reg: ldo_vibr {
233+
regulator-name = "vibr";
234+
regulator-min-microvolt = <1200000>;
235+
regulator-max-microvolt = <3300000>;
236+
regulator-enable-ramp-delay = <218>;
237+
};
238+
};

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,21 @@ properties:
2828
reg:
2929
maxItems: 1
3030

31+
lvin-supply:
32+
description: Input supply phandle for LDO1 and LDO2
33+
34+
pvin1-supply:
35+
description: Input supply phandle for VDD_IO (BUCK1)
36+
37+
pvin2-supply:
38+
description: Input supply phandle for VDD_DDR (BUCK2)
39+
40+
pvin3-supply:
41+
description: Input supply phandle for VDD_CORE (BUCK3)
42+
43+
pvin4-supply:
44+
description: Input supply phandle for VDD_OTHER (BUCK4)
45+
3146
regulators:
3247
type: object
3348
additionalProperties: false
@@ -68,6 +83,11 @@ examples:
6883
pmic@5b {
6984
compatible = "microchip,mcp16502";
7085
reg = <0x5b>;
86+
lvin-supply = <&reg_5v>;
87+
pvin1-supply = <&reg_5v>;
88+
pvin2-supply = <&reg_5v>;
89+
pvin3-supply = <&reg_5v>;
90+
pvin4-supply = <&reg_5v>;
7191
7292
regulators {
7393
VDD_IO {

0 commit comments

Comments
 (0)