[PATCH 0/4] STM32MP13x expose SCMI regulators

[PATCH 0/4] STM32MP13x expose SCMI regulators

[p.paillet]

From: Pascal Paillet <p.paillet@foss.st.com>

Updates STM32MP13 DTS files to define the voltage regulators
exposed by OP-TEE SCMI service and remove the fixed regulator
abstraction previously used.

Etienne Carriere (3):
  dt-bindings: rcc: stm32: add STM32MP13 SCMI regulators IDs
  ARM: dts: stm32: STM32MP13x SoC exposes SCMI regulators
  ARM: dts: stm32: add SCMI PMIC regulators on stm32mp135f-dk board

Pascal Paillet (1):
  ARM: multi_v7_defconfig: Add SCMI regulator support

 arch/arm/boot/dts/st/stm32mp131.dtsi          | 50 +++++++-------
 arch/arm/boot/dts/st/stm32mp135f-dk.dts       | 68 ++++++++-----------
 arch/arm/configs/multi_v7_defconfig           |  1 +
 .../regulator/st,stm32mp13-regulator.h        | 42 ++++++++++++
 4 files changed, 98 insertions(+), 63 deletions(-)
 create mode 100644 include/dt-bindings/regulator/st,stm32mp13-regulator.h

-- 
2.25.1

[PATCH 1/4] dt-bindings: rcc: stm32: add STM32MP13 SCMI regulators IDs

[p.paillet]

From: Etienne Carriere <etienne.carriere@foss.st.com>

Adds SCMI regulator identifiers for STM32MP13x family.

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
Signed-off-by: Pascal Paillet <p.paillet@foss.st.com>
---
 .../regulator/st,stm32mp13-regulator.h        | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 include/dt-bindings/regulator/st,stm32mp13-regulator.h

diff --git a/include/dt-bindings/regulator/st,stm32mp13-regulator.h b/include/dt-bindings/regulator/st,stm32mp13-regulator.h
new file mode 100644
index 000000000000..b3a974dfc585
--- /dev/null
+++ b/include/dt-bindings/regulator/st,stm32mp13-regulator.h
@@ -0,0 +1,42 @@
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) */
+/*
+ * Copyright (C) 2022, STMicroelectronics - All Rights Reserved
+ */
+
+#ifndef __DT_BINDINGS_REGULATOR_ST_STM32MP13_REGULATOR_H
+#define __DT_BINDINGS_REGULATOR_ST_STM32MP13_REGULATOR_H
+
+/* SCMI voltage domains identifiers */
+
+/* SOC Internal regulators */
+#define VOLTD_SCMI_REG11		0
+#define VOLTD_SCMI_REG18		1
+#define VOLTD_SCMI_USB33		2
+#define VOLTD_SCMI_SDMMC1_IO		3
+#define VOLTD_SCMI_SDMMC2_IO		4
+#define VOLTD_SCMI_VREFBUF		5
+
+/* STPMIC1 regulators */
+#define VOLTD_SCMI_STPMIC1_BUCK1	6
+#define VOLTD_SCMI_STPMIC1_BUCK2	7
+#define VOLTD_SCMI_STPMIC1_BUCK3	8
+#define VOLTD_SCMI_STPMIC1_BUCK4	9
+#define VOLTD_SCMI_STPMIC1_LDO1	        10
+#define VOLTD_SCMI_STPMIC1_LDO2	        11
+#define VOLTD_SCMI_STPMIC1_LDO3	        12
+#define VOLTD_SCMI_STPMIC1_LDO4	        13
+#define VOLTD_SCMI_STPMIC1_LDO5	        14
+#define VOLTD_SCMI_STPMIC1_LDO6	        15
+#define VOLTD_SCMI_STPMIC1_VREFDDR	16
+#define VOLTD_SCMI_STPMIC1_BOOST	17
+#define VOLTD_SCMI_STPMIC1_PWR_SW1	18
+#define VOLTD_SCMI_STPMIC1_PWR_SW2	19
+
+/* External regulators */
+#define VOLTD_SCMI_REGU0		20
+#define VOLTD_SCMI_REGU1		21
+#define VOLTD_SCMI_REGU2		22
+#define VOLTD_SCMI_REGU3		23
+#define VOLTD_SCMI_REGU4		24
+
+#endif /*__DT_BINDINGS_REGULATOR_ST_STM32MP13_REGULATOR_H */
-- 
2.25.1

[PATCH 2/4] ARM: dts: stm32: STM32MP13x SoC exposes SCMI regulators

[p.paillet]

From: Etienne Carriere <etienne.carriere@foss.st.com>

Updates STM32MP13x SoC DTSI file to define the SoC voltage regulators
exposed by OP-TEE SCMI service and remove the fixed regulator
abstraction previously used until OP-TEE OS firmware embeds the
service which it does since its release tag 3.22.0.

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
Signed-off-by: Pascal Paillet <p.paillet@foss.st.com>
---
 arch/arm/boot/dts/st/stm32mp131.dtsi | 50 ++++++++++++++--------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/arch/arm/boot/dts/st/stm32mp131.dtsi b/arch/arm/boot/dts/st/stm32mp131.dtsi
index 672f3b7735a2..ac90fcbf0c09 100644
--- a/arch/arm/boot/dts/st/stm32mp131.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp131.dtsi
@@ -52,6 +52,28 @@ scmi_reset: protocol@16 {
 				reg = <0x16>;
 				#reset-cells = <1>;
 			};
+
+			scmi_voltd: protocol@17 {
+				reg = <0x17>;
+
+				scmi_regu: regulators {
+					#address-cells = <1>;
+					#size-cells = <0>;
+
+					scmi_reg11: regulator@0 {
+						reg = <VOLTD_SCMI_REG11>;
+						regulator-name = "reg11";
+					};
+					scmi_reg18: regulator@1 {
+						reg = <VOLTD_SCMI_REG18>;
+						regulator-name = "reg18";
+					};
+					scmi_usb33: regulator@2 {
+						reg = <VOLTD_SCMI_USB33>;
+						regulator-name = "usb33";
+					};
+				};
+			};
 		};
 	};
 
@@ -78,28 +100,6 @@ timer {
 		always-on;
 	};
 
-	/* PWR 1v1, 1v8 and 3v3 regulators defined as fixed, waiting for SCMI */
-	reg11: reg11 {
-		compatible = "regulator-fixed";
-		regulator-name = "reg11";
-		regulator-min-microvolt = <1100000>;
-		regulator-max-microvolt = <1100000>;
-	};
-
-	reg18: reg18 {
-		compatible = "regulator-fixed";
-		regulator-name = "reg18";
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <1800000>;
-	};
-
-	usb33: usb33 {
-		compatible = "regulator-fixed";
-		regulator-name = "usb33";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-	};
-
 	soc {
 		compatible = "simple-bus";
 		#address-cells = <1>;
@@ -801,7 +801,7 @@ usbotg_hs: usb@49000000 {
 			g-tx-fifo-size = <256 16 16 16 16 16 16 16>;
 			dr_mode = "otg";
 			otg-rev = <0x200>;
-			usb33d-supply = <&usb33>;
+			usb33d-supply = <&scmi_usb33>;
 			status = "disabled";
 		};
 
@@ -1331,8 +1331,8 @@ usbphyc: usbphyc@5a006000 {
 			reg = <0x5a006000 0x1000>;
 			clocks = <&rcc USBPHY_K>;
 			resets = <&rcc USBPHY_R>;
-			vdda1v1-supply = <&reg11>;
-			vdda1v8-supply = <&reg18>;
+			vdda1v1-supply = <&scmi_reg11>;
+			vdda1v8-supply = <&scmi_reg18>;
 			status = "disabled";
 
 			usbphyc_port0: usb-phy@0 {
-- 
2.25.1

[PATCH 3/4] ARM: dts: stm32: add SCMI PMIC regulators on stm32mp135f-dk board

[p.paillet]

From: Etienne Carriere <etienne.carriere@foss.st.com>

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>
---
 arch/arm/boot/dts/st/stm32mp135f-dk.dts | 68 +++++++++++--------------
 1 file changed, 30 insertions(+), 38 deletions(-)

diff --git a/arch/arm/boot/dts/st/stm32mp135f-dk.dts b/arch/arm/boot/dts/st/stm32mp135f-dk.dts
index f0900ca672b5..eea740d097c7 100644
--- a/arch/arm/boot/dts/st/stm32mp135f-dk.dts
+++ b/arch/arm/boot/dts/st/stm32mp135f-dk.dts
@@ -9,6 +9,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/regulator/st,stm32mp13-regulator.h>
 #include "stm32mp135.dtsi"
 #include "stm32mp13xf.dtsi"
 #include "stm32mp13-pinctrl.dtsi"
@@ -65,45 +66,13 @@ led-blue {
 			default-state = "off";
 		};
 	};
-
-	v3v3_sw: v3v3-sw {
-		compatible = "regulator-fixed";
-		regulator-name = "v3v3_sw";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		regulator-always-on;
-	};
-
-	vdd_adc: vdd-adc {
-		compatible = "regulator-fixed";
-		regulator-name = "vdd_adc";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		regulator-always-on;
-	};
-
-	vdd_sd: vdd-sd {
-		compatible = "regulator-fixed";
-		regulator-name = "vdd_sd";
-		regulator-min-microvolt = <2900000>;
-		regulator-max-microvolt = <2900000>;
-		regulator-always-on;
-	};
-
-	vdd_usb: vdd-usb {
-		compatible = "regulator-fixed";
-		regulator-name = "vdd_usb";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		regulator-always-on;
-	};
 };
 
 &adc_1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&adc1_usb_cc_pins_a>;
-	vdda-supply = <&vdd_adc>;
-	vref-supply = <&vdd_adc>;
+	vdda-supply = <&scmi_vdd_adc>;
+	vref-supply = <&scmi_vdd_adc>;
 	status = "okay";
 	adc1: adc@0 {
 		status = "okay";
@@ -195,6 +164,29 @@ &rtc {
 	status = "okay";
 };
 
+&scmi_regu {
+	scmi_vdd_adc: regulator@10 {
+		reg = <VOLTD_SCMI_STPMIC1_LDO1>;
+		regulator-name = "vdd_adc";
+	};
+	scmi_vdd_usb: regulator@13 {
+		reg = <VOLTD_SCMI_STPMIC1_LDO4>;
+		regulator-name = "vdd_usb";
+	};
+	scmi_vdd_sd: regulator@14 {
+		reg = <VOLTD_SCMI_STPMIC1_LDO5>;
+		regulator-name = "vdd_sd";
+	};
+	scmi_v1v8_periph: regulator@15 {
+		reg = <VOLTD_SCMI_STPMIC1_LDO6>;
+		regulator-name = "v1v8_periph";
+	};
+	scmi_v3v3_sw: regulator@19 {
+		reg = <VOLTD_SCMI_STPMIC1_PWR_SW2>;
+		regulator-name = "v3v3_sw";
+	};
+};
+
 &sdmmc1 {
 	pinctrl-names = "default", "opendrain", "sleep";
 	pinctrl-0 = <&sdmmc1_b4_pins_a &sdmmc1_clk_pins_a>;
@@ -204,7 +196,7 @@ &sdmmc1 {
 	disable-wp;
 	st,neg-edge;
 	bus-width = <4>;
-	vmmc-supply = <&vdd_sd>;
+	vmmc-supply = <&scmi_vdd_sd>;
 	status = "okay";
 };
 
@@ -321,7 +313,7 @@ &usbh_ehci {
 	hub@1 {
 		compatible = "usb424,2514";
 		reg = <1>;
-		vdd-supply = <&v3v3_sw>;
+		vdd-supply = <&scmi_v3v3_sw>;
 	};
 };
 
@@ -342,7 +334,7 @@ &usbphyc {
 };
 
 &usbphyc_port0 {
-	phy-supply = <&vdd_usb>;
+	phy-supply = <&scmi_vdd_usb>;
 	st,current-boost-microamp = <1000>;
 	st,decrease-hs-slew-rate;
 	st,tune-hs-dc-level = <2>;
@@ -356,7 +348,7 @@ &usbphyc_port0 {
 };
 
 &usbphyc_port1 {
-	phy-supply = <&vdd_usb>;
+	phy-supply = <&scmi_vdd_usb>;
 	st,current-boost-microamp = <1000>;
 	st,decrease-hs-slew-rate;
 	st,tune-hs-dc-level = <2>;
-- 
2.25.1

[PATCH 4/4] ARM: multi_v7_defconfig: Add SCMI regulator support

[p.paillet]

From: Pascal Paillet <p.paillet@foss.st.com>

Enable ARM SCMI regulator support.

Signed-off-by: Pascal Paillet <p.paillet@foss.st.com>
---
 arch/arm/configs/multi_v7_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index f0800f806b5f..524ca56f52d9 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -612,6 +612,7 @@ CONFIG_MFD_ACER_A500_EC=m
 CONFIG_REGULATOR_ACT8865=y
 CONFIG_REGULATOR_ACT8945A=y
 CONFIG_REGULATOR_ANATOP=y
+CONFIG_REGULATOR_ARM_SCMI=y
 CONFIG_REGULATOR_AB8500=y
 CONFIG_REGULATOR_AS3711=y
 CONFIG_REGULATOR_AS3722=y
-- 
2.25.1

Re: [PATCH 1/4] dt-bindings: rcc: stm32: add STM32MP13 SCMI regulators IDs

[Conor Dooley]

[-- Attachment #1: Type: text/plain, Size: 392 bytes --]

On Wed, Jul 12, 2023 at 04:24:29PM +0200, p.paillet@foss.st.com wrote:
> From: Etienne Carriere <etienne.carriere@foss.st.com>
> 
> Adds SCMI regulator identifiers for STM32MP13x family.
> 
> Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
> Signed-off-by: Pascal Paillet <p.paillet@foss.st.com>

Acked-by: Conor Dooley <conor.dooley@microchip.com>

Cheers,
Conor.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH 4/4] ARM: multi_v7_defconfig: Add SCMI regulator support

[Krzysztof Kozlowski]

On 12/07/2023 16:24, p.paillet@foss.st.com wrote:
> From: Pascal Paillet <p.paillet@foss.st.com>
> 
> Enable ARM SCMI regulator support.
> 

This we see from the diff. Please explain why, e.g. which boards use it.

Best regards,
Krzysztof

Re: [PATCH 4/4] ARM: multi_v7_defconfig: Add SCMI regulator support

[Patrick DELAUNAY]

Hi,

On 7/12/23 21:25, Krzysztof Kozlowski wrote:
> On 12/07/2023 16:24, p.paillet@foss.st.com wrote:
>> From: Pascal Paillet <p.paillet@foss.st.com>
>>
>> Enable ARM SCMI regulator support.
>>
> This we see from the diff. Please explain why, e.g. which boards use it.
>
> Best regards,
> Krzysztof


The STM32MP platforms rely on OP-TEE to boot: Clocks and regulators are 
handled in
the secure world by OP-TEE and exported to the non secure world (LINUX)
thanks to ARM SCMI protocol.

Today it is used in the ARMv7 STMicrolectronics stm32mp boards:
- for STM32MP13: stm32mp135f-dk
- the STM32MP15 boards with SCMI variant, introduced by commit 5b7e58313a77
   ("ARM: dts: stm32: Add SCMI version of STM32 boards (DK1/DK2/ED1/EV1)")
   * stm32mp157c-ev1-scmi
   * stm32mp157c-ed1-scmi
   * stm32mp157c-dk2-scmi
   * stm32mp157a-dk1-scmi

This SCMI server provide access to "secured" resources protected in SoC
(for example with RCC_SECFGR); the resources need to be available early
for these board and the  SCMI server is associated with OP-TEE, already
activated by the commit 24c159793238  ("ARM: multi_v7_defconfig: Add
OPTEE support").

Regards

Patrick

> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>

Re: [PATCH 4/4] ARM: multi_v7_defconfig: Add SCMI regulator support

[Alexandre TORGUE]

Hi Krzysztof

On 7/12/23 21:25, Krzysztof Kozlowski wrote:
> On 12/07/2023 16:24, p.paillet@foss.st.com wrote:
>> From: Pascal Paillet <p.paillet@foss.st.com>
>>
>> Enable ARM SCMI regulator support.
>>
> 
> This we see from the diff. Please explain why, e.g. which boards use it.
> 
> Best regards,
> Krzysztof
> 

If you agree I will add some words explaining SCMI regulator on STM32 
board in the commit message (As Patrick mentioned in his answer). I 
would like to have this patch in my next PR for v6.6. If no objections 
I'll do it directly when I merge the patch in stm32-next.

Cheers
Alex

Re: [PATCH 0/4] STM32MP13x expose SCMI regulators

[Alexandre TORGUE]

Hi Pascal

On 7/12/23 16:24, p.paillet@foss.st.com wrote:
> From: Pascal Paillet <p.paillet@foss.st.com>
> 
> Updates STM32MP13 DTS files to define the voltage regulators
> exposed by OP-TEE SCMI service and remove the fixed regulator
> abstraction previously used.
> 
> Etienne Carriere (3):
>    dt-bindings: rcc: stm32: add STM32MP13 SCMI regulators IDs
>    ARM: dts: stm32: STM32MP13x SoC exposes SCMI regulators
>    ARM: dts: stm32: add SCMI PMIC regulators on stm32mp135f-dk board
> 
> Pascal Paillet (1):
>    ARM: multi_v7_defconfig: Add SCMI regulator support
> 
>   arch/arm/boot/dts/st/stm32mp131.dtsi          | 50 +++++++-------
>   arch/arm/boot/dts/st/stm32mp135f-dk.dts       | 68 ++++++++-----------
>   arch/arm/configs/multi_v7_defconfig           |  1 +
>   .../regulator/st,stm32mp13-regulator.h        | 42 ++++++++++++
>   4 files changed, 98 insertions(+), 63 deletions(-)
>   create mode 100644 include/dt-bindings/regulator/st,stm32mp13-regulator.h
> 

Series applied on stm32-next. Commit title of patch[4] has been updated 
to explain the reason of the patch (as suggested by Krzysztof). I also 
ordered the config flag.

Regards
Alex