Skip to content

Commit a34b42f

Browse files
etienne-lmsAlexandre Torgue
authored andcommitted
ARM: dts: stm32: fix pwr regulators references to use scmi
Fixes stm32mp15*-scmi DTS files introduced in [1] to also access PWR regulators through SCMI service. This is needed since enabling secure only access to RCC clock and reset controllers also enables secure access only on PWR voltage regulators reg11, reg18 and usb33 hence these must also be accessed through SCMI Voltage Domain protocol. This change applies on commit [2] that already corrects issues from commit [1]. Cc: Alexandre Torgue <[email protected]> Link: [1] https://lore.kernel.org/linux-arm-kernel/[email protected] Link: [2] https://lore.kernel.org/linux-arm-kernel/[email protected] Signed-off-by: Etienne Carriere <[email protected]> Signed-off-by: Alexandre Torgue <[email protected]>
1 parent 03c765b commit a34b42f

File tree

3 files changed

+54
-0
lines changed

3 files changed

+54
-0
lines changed

arch/arm/boot/dts/stm32mp15-scmi.dtsi

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,37 @@
2727
reg = <0x16>;
2828
#reset-cells = <1>;
2929
};
30+
31+
scmi_voltd: protocol@17 {
32+
reg = <0x17>;
33+
34+
scmi_reguls: regulators {
35+
#address-cells = <1>;
36+
#size-cells = <0>;
37+
38+
scmi_reg11: reg11@0 {
39+
reg = <0>;
40+
regulator-name = "reg11";
41+
regulator-min-microvolt = <1100000>;
42+
regulator-max-microvolt = <1100000>;
43+
};
44+
45+
scmi_reg18: reg18@1 {
46+
voltd-name = "reg18";
47+
reg = <1>;
48+
regulator-name = "reg18";
49+
regulator-min-microvolt = <1800000>;
50+
regulator-max-microvolt = <1800000>;
51+
};
52+
53+
scmi_usb33: usb33@2 {
54+
reg = <2>;
55+
regulator-name = "usb33";
56+
regulator-min-microvolt = <3300000>;
57+
regulator-max-microvolt = <3300000>;
58+
};
59+
};
60+
};
3061
};
3162
};
3263

@@ -45,3 +76,24 @@
4576
};
4677
};
4778
};
79+
80+
&reg11 {
81+
status = "disabled";
82+
};
83+
84+
&reg18 {
85+
status = "disabled";
86+
};
87+
88+
&usb33 {
89+
status = "disabled";
90+
};
91+
92+
&usbotg_hs {
93+
usb33d-supply = <&scmi_usb33>;
94+
};
95+
96+
&usbphyc {
97+
vdda1v1-supply = <&scmi_reg11>;
98+
vdda1v8-supply = <&scmi_reg18>;
99+
};

arch/arm/boot/dts/stm32mp157c-dk2-scmi.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
};
3636

3737
&dsi {
38+
phy-dsi-supply = <&scmi_reg18>;
3839
clocks = <&rcc DSI_K>, <&scmi_clk CK_SCMI_HSE>, <&rcc DSI_PX>;
3940
};
4041

arch/arm/boot/dts/stm32mp157c-ev1-scmi.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
};
3737

3838
&dsi {
39+
phy-dsi-supply = <&scmi_reg18>;
3940
clocks = <&rcc DSI_K>, <&scmi_clk CK_SCMI_HSE>, <&rcc DSI_PX>;
4041
};
4142

0 commit comments

Comments
 (0)