Skip to content

Commit a6955d3

Browse files
brooniebroonie
committed
Merge remote-tracking branches 'regulator/topic/mt6380', 'regulator/topic/mtk', 'regulator/topic/pv88090', 'regulator/topic/pwm' and 'regulator/topic/qcom' into regulator-next
6 parents 02929a4 + d57287b + 723310d + 8986a11 + a4aae5a + e3b53b8 commit a6955d3

File tree

14 files changed

+511
-15
lines changed

14 files changed

+511
-15
lines changed

‎Documentation/devicetree/bindings/regulator/mt6311-regulator.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Mediatek MT6311 Regulator Driver
1+
Mediatek MT6311 Regulator
22

33
Required properties:
44
- compatible: "mediatek,mt6311-regulator"

‎Documentation/devicetree/bindings/regulator/mt6323-regulator.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Mediatek MT6323 Regulator Driver
1+
Mediatek MT6323 Regulator
22

33
All voltage regulators are defined as subnodes of the regulators node. A list
44
of regulators provided by this controller are defined as subnodes of the

‎Documentation/devicetree/bindings/regulator/mt6380-regulator.txt

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
MediaTek MT6380 Regulator
2+
3+
All voltage regulators provided by the MT6380 PMIC are described as the
4+
subnodes of the MT6380 regulators node. Each regulator is named according
5+
to its regulator type, buck-<name> and ldo-<name>. The definition for each
6+
of these nodes is defined using the standard binding for regulators at
7+
Documentation/devicetree/bindings/regulator/regulator.txt.
8+
9+
The valid names for regulators are:
10+
BUCK:
11+
buck-core1, buck-vcore, buck-vrf
12+
LDO:
13+
ldo-vm ,ldo-va , ldo-vphy, ldo-vddr, ldo-vt
14+
15+
Example:
16+
17+
regulators {
18+
compatible = "mediatek,mt6380-regulator";
19+
20+
mt6380_vcpu_reg: buck-vcore1 {
21+
regulator-name = "vcore1";
22+
regulator-min-microvolt = < 600000>;
23+
regulator-max-microvolt = <1393750>;
24+
regulator-ramp-delay = <6250>;
25+
regulator-always-on;
26+
regulator-boot-on;
27+
};
28+
29+
mt6380_vcore_reg: buck-vcore {
30+
regulator-name = "vcore";
31+
regulator-min-microvolt = <600000>;
32+
regulator-max-microvolt = <1393750>;
33+
regulator-ramp-delay = <6250>;
34+
};
35+
36+
mt6380_vrf_reg: buck-vrf {
37+
regulator-name = "vrf";
38+
regulator-min-microvolt = <1200000>;
39+
regulator-max-microvolt = <1575000>;
40+
regulator-ramp-delay = <0>;
41+
regulator-always-on;
42+
regulator-boot-on;
43+
};
44+
45+
mt6380_vm_reg: ldo-vm {
46+
regulator-name = "vm";
47+
regulator-min-microvolt = <1050000>;
48+
regulator-max-microvolt = <1400000>;
49+
regulator-ramp-delay = <0>;
50+
regulator-always-on;
51+
regulator-boot-on;
52+
};
53+
54+
mt6380_va_reg: ldo-va {
55+
regulator-name = "va";
56+
regulator-min-microvolt = <2200000>;
57+
regulator-max-microvolt = <3300000>;
58+
regulator-ramp-delay = <0>;
59+
regulator-always-on;
60+
regulator-boot-on;
61+
};
62+
63+
mt6380_vphy_reg: ldo-vphy {
64+
regulator-name = "vphy";
65+
regulator-min-microvolt = <1800000>;
66+
regulator-max-microvolt = <1800000>;
67+
regulator-ramp-delay = <0>;
68+
regulator-always-on;
69+
regulator-boot-on;
70+
};
71+
72+
mt6380_vddr_reg: ldo-vddr {
73+
regulator-name = "vddr";
74+
regulator-min-microvolt = <1240000>;
75+
regulator-max-microvolt = <1840000>;
76+
regulator-ramp-delay = <0>;
77+
regulator-always-on;
78+
regulator-boot-on;
79+
};
80+
81+
mt6380_vt_reg: ldo-vt {
82+
regulator-name = "vt";
83+
regulator-min-microvolt = <2200000>;
84+
regulator-max-microvolt = <3300000>;
85+
regulator-ramp-delay = <0>;
86+
regulator-always-on;
87+
regulator-boot-on;
88+
};
89+
};

‎Documentation/devicetree/bindings/regulator/mt6397-regulator.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Mediatek MT6397 Regulator Driver
1+
Mediatek MT6397 Regulator
22

33
Required properties:
44
- compatible: "mediatek,mt6397-regulator"

‎Documentation/devicetree/bindings/regulator/pwm-regulator.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Continuous Voltage With Enable GPIO Example:
7171
* Inverted PWM logic, and the duty cycle range is limited
7272
* to 30%-70%.
7373
*/
74-
pwm-dutycycle-range <700 300>; /* */
74+
pwm-dutycycle-range = <700 300>; /* */
7575
};
7676

7777
Voltage Table Example:

‎drivers/regulator/Kconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,15 @@ config REGULATOR_MT6323
559559
This driver supports the control of different power rails of device
560560
through regulator interface.
561561

562+
config REGULATOR_MT6380
563+
tristate "MediaTek MT6380 PMIC"
564+
depends on MTK_PMIC_WRAP
565+
help
566+
Say y here to select this option to enable the power regulator of
567+
MediaTek MT6380 PMIC.
568+
This driver supports the control of different power rails of device
569+
through regulator interface.
570+
562571
config REGULATOR_MT6397
563572
tristate "MediaTek MT6397 PMIC"
564573
depends on MFD_MT6397

‎drivers/regulator/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o
7272
obj-$(CONFIG_REGULATOR_MC13XXX_CORE) += mc13xxx-regulator-core.o
7373
obj-$(CONFIG_REGULATOR_MT6311) += mt6311-regulator.o
7474
obj-$(CONFIG_REGULATOR_MT6323) += mt6323-regulator.o
75+
obj-$(CONFIG_REGULATOR_MT6380) += mt6380-regulator.o
7576
obj-$(CONFIG_REGULATOR_MT6397) += mt6397-regulator.o
7677
obj-$(CONFIG_REGULATOR_QCOM_RPM) += qcom_rpm-regulator.o
7778
obj-$(CONFIG_REGULATOR_QCOM_SMD_RPM) += qcom_smd-regulator.o

0 commit comments

Comments
 (0)