Skip to content

Commit

Permalink
ARM: dts: stm32: fix pwr regulators references to use scmi
Browse files Browse the repository at this point in the history
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 <alexandre.torgue@foss.st.com>
Link: [1] https://lore.kernel.org/linux-arm-kernel/20220422150952.20587-7-alexandre.torgue@foss.st.com
Link: [2] https://lore.kernel.org/linux-arm-kernel/20220613071920.5463-1-alexandre.torgue@foss.st.com
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Alexandre Torgue <alexandre.torgue@foss.st.com>
  • Loading branch information
Etienne Carriere authored and Alexandre Torgue committed Jul 4, 2022
1 parent 03c765b commit a34b42f
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 0 deletions.
52 changes: 52 additions & 0 deletions arch/arm/boot/dts/stm32mp15-scmi.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,37 @@
reg = <0x16>;
#reset-cells = <1>;
};

scmi_voltd: protocol@17 {
reg = <0x17>;

scmi_reguls: regulators {
#address-cells = <1>;
#size-cells = <0>;

scmi_reg11: reg11@0 {
reg = <0>;
regulator-name = "reg11";
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
};

scmi_reg18: reg18@1 {
voltd-name = "reg18";
reg = <1>;
regulator-name = "reg18";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};

scmi_usb33: usb33@2 {
reg = <2>;
regulator-name = "usb33";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
};
};
};
};

Expand All @@ -45,3 +76,24 @@
};
};
};

&reg11 {
status = "disabled";
};

&reg18 {
status = "disabled";
};

&usb33 {
status = "disabled";
};

&usbotg_hs {
usb33d-supply = <&scmi_usb33>;
};

&usbphyc {
vdda1v1-supply = <&scmi_reg11>;
vdda1v8-supply = <&scmi_reg18>;
};
1 change: 1 addition & 0 deletions arch/arm/boot/dts/stm32mp157c-dk2-scmi.dts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
};

&dsi {
phy-dsi-supply = <&scmi_reg18>;
clocks = <&rcc DSI_K>, <&scmi_clk CK_SCMI_HSE>, <&rcc DSI_PX>;
};

Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/stm32mp157c-ev1-scmi.dts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
};

&dsi {
phy-dsi-supply = <&scmi_reg18>;
clocks = <&rcc DSI_K>, <&scmi_clk CK_SCMI_HSE>, <&rcc DSI_PX>;
};

Expand Down

0 comments on commit a34b42f

Please sign in to comment.