Skip to contentSkip to conversation

update regulator configuration for stm32mp157 boards

PATCH New Pascal Paillet 1 participant 4 messages Oct 11, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover update regulator configuration for stm32mp157 boards

The goal of this patch-set is to
- add support of PWR blok regulators on the stm32mp157 boards
- undapte various regulator configurations

Pascal Paillet (4):
ARM: dts: stm32: add PWR regulators support on stm32mp157
ARM: dts: stm32: change default minimal buck1 value on stm32mp157
ARM: dts: stm32: Fix active discharge usage on stm32mp157
ARM: dts: stm32: disable active-discharge for vbus_otg on

    stm32mp157a-avenger96
 arch/arm/boot/dts/stm32mp157a-avenger96.dts |  8 +++++--
 arch/arm/boot/dts/stm32mp157a-dk1.dts       |  9 ++++++--
 arch/arm/boot/dts/stm32mp157c-dk2.dts       |  8 -------
 arch/arm/boot/dts/stm32mp157c-ed1.dts       | 25 ++++++---------------
 arch/arm/boot/dts/stm32mp157c.dtsi          | 23 +++++++++++++++++++
 5 files changed, 43 insertions(+), 30 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/4 ARM: dts: stm32: add PWR regulators support on stm32mp157

This patch adds support of STM32 PWR regulators on stm32mp157c. This replace dummy fixed regulators on stm32mp157c-ed1 and stm32mp157c-dk2.

---
 arch/arm/boot/dts/stm32mp157a-avenger96.dts |  5 +++++
 arch/arm/boot/dts/stm32mp157a-dk1.dts       |  5 +++++
 arch/arm/boot/dts/stm32mp157c-dk2.dts       |  8 -------
 arch/arm/boot/dts/stm32mp157c-ed1.dts       | 21 +++++--------------
 arch/arm/boot/dts/stm32mp157c.dtsi          | 23 +++++++++++++++++++++
 5 files changed, 38 insertions(+), 24 deletions(-)
arch/arm/boot/dts/stm32mp157a-avenger96.dts +5 -0
index 2e4742c53d04..5f35b0146017 100644
@@ -282,6 +282,11 @@
 	status = "okay";
 };
 
+&pwr_regulators {
+	vdd-supply = <&vdd>;
+	vdd_3v3_usbfs-supply = <&vdd_usb>;
+};
+
 &rng1 {
 	status = "okay";
 };
arch/arm/boot/dts/stm32mp157a-dk1.dts +5 -0
index 5ad4cef9e971..26fb7c77092c 100644
@@ -406,6 +406,11 @@
 	status = "okay";
 };
 
+&pwr_regulators {
+	vdd-supply = <&vdd>;
+	vdd_3v3_usbfs-supply = <&vdd_usb>;
+};
+
 &rng1 {
 	status = "okay";
 };
arch/arm/boot/dts/stm32mp157c-dk2.dts +0 -8
index d44a7c6c2e20..d26adcbeba33 100644
@@ -11,14 +11,6 @@
 / {
 	model = "STMicroelectronics STM32MP157C-DK2 Discovery Board";
 	compatible = "st,stm32mp157c-dk2", "st,stm32mp157";
-
-	reg18: reg18 {
-		compatible = "regulator-fixed";
-		regulator-name = "reg18";
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <1800000>;
-		regulator-always-on;
-	};
 };
 
 &dsi {
arch/arm/boot/dts/stm32mp157c-ed1.dts +5 -16
index 1d426ea8bdaf..1dbcc580e43c 100644
@@ -74,22 +74,6 @@
 		serial0 = &uart4;
 	};
 
-	reg11: reg11 {
-		compatible = "regulator-fixed";
-		regulator-name = "reg11";
-		regulator-min-microvolt = <1100000>;
-		regulator-max-microvolt = <1100000>;
-		regulator-always-on;
-	};
-
-	reg18: reg18 {
-		compatible = "regulator-fixed";
-		regulator-name = "reg18";
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <1800000>;
-		regulator-always-on;
-	};
-
 	sd_switch: regulator-sd_switch {
 		compatible = "regulator-gpio";
 		regulator-name = "sd_switch";
@@ -279,6 +263,11 @@
 	status = "okay";
 };
 
+&pwr_regulators {
+	vdd-supply = <&vdd>;
+	vdd_3v3_usbfs-supply = <&vdd_usb>;
+};
+
 &rng1 {
 	status = "okay";
 };
arch/arm/boot/dts/stm32mp157c.dtsi +23 -0
index 9b11654a0a39..e0f3d4c62b4f 100644
@@ -1079,6 +1079,29 @@
 			#reset-cells = <1>;
 		};
 
+		pwr_regulators: pwr@50001000 {
+			compatible = "st,stm32mp1,pwr-reg";
+			reg = <0x50001000 0x10>;
+
+			reg11: reg11 {
+				regulator-name = "reg11";
+				regulator-min-microvolt = <1100000>;
+				regulator-max-microvolt = <1100000>;
+			};
+
+			reg18: reg18 {
+				regulator-name = "reg18";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+			};
+
+			usb33: usb33 {
+				regulator-name = "usb33";
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+			};
+		};
+
 		exti: interrupt-controller@5000d000 {
 			compatible = "st,stm32mp1-exti", "syscon";
 			interrupt-controller;
Signature · 1 line
2.17.1
#2 lore raw

PATCH 2/4 ARM: dts: stm32: change default minimal buck1 value on stm32mp157

In reply to Pascal Paillet

Minimal value is the value set during boot or before suspend. We must ensure that the value is a functional value to boot.

---
 arch/arm/boot/dts/stm32mp157a-dk1.dts | 2 +-
 arch/arm/boot/dts/stm32mp157c-ed1.dts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/stm32mp157a-dk1.dts +1 -1
index 26fb7c77092c..efeefb3d25b0 100644
@@ -250,7 +250,7 @@
 
 			vddcore: buck1 {
 				regulator-name = "vddcore";
-				regulator-min-microvolt = <800000>;
+				regulator-min-microvolt = <1200000>;
 				regulator-max-microvolt = <1350000>;
 				regulator-always-on;
 				regulator-initial-mode = <0>;
arch/arm/boot/dts/stm32mp157c-ed1.dts +1 -1
index 1dbcc580e43c..15afa8f1a36f 100644
@@ -127,7 +127,7 @@
 
 			vddcore: buck1 {
 				regulator-name = "vddcore";
-				regulator-min-microvolt = <800000>;
+				regulator-min-microvolt = <1200000>;
 				regulator-max-microvolt = <1350000>;
 				regulator-always-on;
 				regulator-initial-mode = <0>;
Signature · 1 line
2.17.1
#3 lore raw

PATCH 3/4 ARM: dts: stm32: Fix active discharge usage on stm32mp157

In reply to Pascal Paillet

Active discharge is a uint32 not a boolean.

---
 arch/arm/boot/dts/stm32mp157a-avenger96.dts | 4 ++--
 arch/arm/boot/dts/stm32mp157a-dk1.dts       | 2 +-
 arch/arm/boot/dts/stm32mp157c-ed1.dts       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/stm32mp157a-avenger96.dts +2 -2
index 5f35b0146017..d1cc42a92d3f 100644
@@ -252,14 +252,14 @@
 				regulator-name = "vbus_otg";
 				interrupts = <IT_OCP_OTG 0>;
 				interrupt-parent = <&pmic>;
-				regulator-active-discharge;
+				regulator-active-discharge = <1>;
 			};
 
 			vbus_sw: pwr_sw2 {
 				regulator-name = "vbus_sw";
 				interrupts = <IT_OCP_SWOUT 0>;
 				interrupt-parent = <&pmic>;
-				regulator-active-discharge;
+				regulator-active-discharge = <1>;
 			};
 		};
 
arch/arm/boot/dts/stm32mp157a-dk1.dts +1 -1
index efeefb3d25b0..0e80f8da28d4 100644
@@ -351,7 +351,7 @@
 			 vbus_sw: pwr_sw2 {
 				regulator-name = "vbus_sw";
 				interrupts = <IT_OCP_SWOUT 0>;
-				regulator-active-discharge;
+				regulator-active-discharge = <1>;
 			 };
 		};
 
arch/arm/boot/dts/stm32mp157c-ed1.dts +1 -1
index 15afa8f1a36f..108612b523de 100644
@@ -225,7 +225,7 @@
 			 vbus_sw: pwr_sw2 {
 				regulator-name = "vbus_sw";
 				interrupts = <IT_OCP_SWOUT 0>;
-				regulator-active-discharge;
+				regulator-active-discharge = <1>;
 			 };
 		};
 
Signature · 1 line
2.17.1