Skip to content

Commit 4c757f6

Browse files
etienne-lmsAlexandre Torgue
authored andcommitted
ARM: dts: stm32: add SCMI PMIC regulators on stm32mp135f-dk board
Since OP-TEE release tag 3.22.0, OP-TEE SCMI service for STM32MP13x SoC family exposes PMIC voltage regulators. This change defines them in the platform DTS file and removes the fixed regulators that were previously defined to abstract them before OP-TEE firmware was ready. Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com> Signed-off-by: Pascal Paillet <p.paillet@foss.st.com> Signed-off-by: Alexandre Torgue <alexandre.torgue@foss.st.com>
1 parent fb266d2 commit 4c757f6

File tree

1 file changed

+30
-38
lines changed

1 file changed

+30
-38
lines changed

arch/arm/boot/dts/st/stm32mp135f-dk.dts

Lines changed: 30 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <dt-bindings/gpio/gpio.h>
1010
#include <dt-bindings/input/input.h>
1111
#include <dt-bindings/leds/common.h>
12+
#include <dt-bindings/regulator/st,stm32mp13-regulator.h>
1213
#include "stm32mp135.dtsi"
1314
#include "stm32mp13xf.dtsi"
1415
#include "stm32mp13-pinctrl.dtsi"
@@ -65,45 +66,13 @@
6566
default-state = "off";
6667
};
6768
};
68-
69-
v3v3_sw: v3v3-sw {
70-
compatible = "regulator-fixed";
71-
regulator-name = "v3v3_sw";
72-
regulator-min-microvolt = <3300000>;
73-
regulator-max-microvolt = <3300000>;
74-
regulator-always-on;
75-
};
76-
77-
vdd_adc: vdd-adc {
78-
compatible = "regulator-fixed";
79-
regulator-name = "vdd_adc";
80-
regulator-min-microvolt = <3300000>;
81-
regulator-max-microvolt = <3300000>;
82-
regulator-always-on;
83-
};
84-
85-
vdd_sd: vdd-sd {
86-
compatible = "regulator-fixed";
87-
regulator-name = "vdd_sd";
88-
regulator-min-microvolt = <2900000>;
89-
regulator-max-microvolt = <2900000>;
90-
regulator-always-on;
91-
};
92-
93-
vdd_usb: vdd-usb {
94-
compatible = "regulator-fixed";
95-
regulator-name = "vdd_usb";
96-
regulator-min-microvolt = <3300000>;
97-
regulator-max-microvolt = <3300000>;
98-
regulator-always-on;
99-
};
10069
};
10170

10271
&adc_1 {
10372
pinctrl-names = "default";
10473
pinctrl-0 = <&adc1_usb_cc_pins_a>;
105-
vdda-supply = <&vdd_adc>;
106-
vref-supply = <&vdd_adc>;
74+
vdda-supply = <&scmi_vdd_adc>;
75+
vref-supply = <&scmi_vdd_adc>;
10776
status = "okay";
10877
adc1: adc@0 {
10978
status = "okay";
@@ -195,6 +164,29 @@
195164
status = "okay";
196165
};
197166

167+
&scmi_regu {
168+
scmi_vdd_adc: regulator@10 {
169+
reg = <VOLTD_SCMI_STPMIC1_LDO1>;
170+
regulator-name = "vdd_adc";
171+
};
172+
scmi_vdd_usb: regulator@13 {
173+
reg = <VOLTD_SCMI_STPMIC1_LDO4>;
174+
regulator-name = "vdd_usb";
175+
};
176+
scmi_vdd_sd: regulator@14 {
177+
reg = <VOLTD_SCMI_STPMIC1_LDO5>;
178+
regulator-name = "vdd_sd";
179+
};
180+
scmi_v1v8_periph: regulator@15 {
181+
reg = <VOLTD_SCMI_STPMIC1_LDO6>;
182+
regulator-name = "v1v8_periph";
183+
};
184+
scmi_v3v3_sw: regulator@19 {
185+
reg = <VOLTD_SCMI_STPMIC1_PWR_SW2>;
186+
regulator-name = "v3v3_sw";
187+
};
188+
};
189+
198190
&sdmmc1 {
199191
pinctrl-names = "default", "opendrain", "sleep";
200192
pinctrl-0 = <&sdmmc1_b4_pins_a &sdmmc1_clk_pins_a>;
@@ -204,7 +196,7 @@
204196
disable-wp;
205197
st,neg-edge;
206198
bus-width = <4>;
207-
vmmc-supply = <&vdd_sd>;
199+
vmmc-supply = <&scmi_vdd_sd>;
208200
status = "okay";
209201
};
210202

@@ -321,7 +313,7 @@
321313
hub@1 {
322314
compatible = "usb424,2514";
323315
reg = <1>;
324-
vdd-supply = <&v3v3_sw>;
316+
vdd-supply = <&scmi_v3v3_sw>;
325317
};
326318
};
327319

@@ -342,7 +334,7 @@
342334
};
343335

344336
&usbphyc_port0 {
345-
phy-supply = <&vdd_usb>;
337+
phy-supply = <&scmi_vdd_usb>;
346338
st,current-boost-microamp = <1000>;
347339
st,decrease-hs-slew-rate;
348340
st,tune-hs-dc-level = <2>;
@@ -356,7 +348,7 @@
356348
};
357349

358350
&usbphyc_port1 {
359-
phy-supply = <&vdd_usb>;
351+
phy-supply = <&scmi_vdd_usb>;
360352
st,current-boost-microamp = <1000>;
361353
st,decrease-hs-slew-rate;
362354
st,tune-hs-dc-level = <2>;

0 commit comments

Comments
 (0)