* [PATCH 0/4] update regulator configuration for stm32mp157 boards
@ 2019-10-11 14:04 Pascal Paillet
2019-10-11 14:04 ` [PATCH 1/4] ARM: dts: stm32: add PWR regulators support on stm32mp157 Pascal Paillet
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Pascal Paillet @ 2019-10-11 14:04 UTC (permalink / raw)
To: mcoquelin.stm32, alexandre.torgue, robh+dt, mark.rutland,
linux-stm32, linux-arm-kernel, devicetree, linux-kernel
Cc: p.paillet
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(-)
--
2.17.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/4] ARM: dts: stm32: add PWR regulators support on stm32mp157
2019-10-11 14:04 [PATCH 0/4] update regulator configuration for stm32mp157 boards Pascal Paillet
@ 2019-10-11 14:04 ` Pascal Paillet
2019-10-11 14:04 ` [PATCH 2/4] ARM: dts: stm32: change default minimal buck1 value " Pascal Paillet
2019-10-11 14:04 ` [PATCH 3/4] ARM: dts: stm32: Fix active discharge usage " Pascal Paillet
2 siblings, 0 replies; 6+ messages in thread
From: Pascal Paillet @ 2019-10-11 14:04 UTC (permalink / raw)
To: mcoquelin.stm32, alexandre.torgue, robh+dt, mark.rutland,
linux-stm32, linux-arm-kernel, devicetree, linux-kernel
Cc: p.paillet
This patch adds support of STM32 PWR regulators on
stm32mp157c. This replace dummy fixed regulators on
stm32mp157c-ed1 and stm32mp157c-dk2.
Signed-off-by: Pascal Paillet <p.paillet@st.com>
---
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(-)
diff --git a/arch/arm/boot/dts/stm32mp157a-avenger96.dts b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
index 2e4742c53d04..5f35b0146017 100644
--- a/arch/arm/boot/dts/stm32mp157a-avenger96.dts
+++ b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
@@ -282,6 +282,11 @@
status = "okay";
};
+&pwr_regulators {
+ vdd-supply = <&vdd>;
+ vdd_3v3_usbfs-supply = <&vdd_usb>;
+};
+
&rng1 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/stm32mp157a-dk1.dts b/arch/arm/boot/dts/stm32mp157a-dk1.dts
index 5ad4cef9e971..26fb7c77092c 100644
--- a/arch/arm/boot/dts/stm32mp157a-dk1.dts
+++ b/arch/arm/boot/dts/stm32mp157a-dk1.dts
@@ -406,6 +406,11 @@
status = "okay";
};
+&pwr_regulators {
+ vdd-supply = <&vdd>;
+ vdd_3v3_usbfs-supply = <&vdd_usb>;
+};
+
&rng1 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/stm32mp157c-dk2.dts b/arch/arm/boot/dts/stm32mp157c-dk2.dts
index d44a7c6c2e20..d26adcbeba33 100644
--- a/arch/arm/boot/dts/stm32mp157c-dk2.dts
+++ b/arch/arm/boot/dts/stm32mp157c-dk2.dts
@@ -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 {
diff --git a/arch/arm/boot/dts/stm32mp157c-ed1.dts b/arch/arm/boot/dts/stm32mp157c-ed1.dts
index 1d426ea8bdaf..1dbcc580e43c 100644
--- a/arch/arm/boot/dts/stm32mp157c-ed1.dts
+++ b/arch/arm/boot/dts/stm32mp157c-ed1.dts
@@ -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";
};
diff --git a/arch/arm/boot/dts/stm32mp157c.dtsi b/arch/arm/boot/dts/stm32mp157c.dtsi
index 9b11654a0a39..e0f3d4c62b4f 100644
--- a/arch/arm/boot/dts/stm32mp157c.dtsi
+++ b/arch/arm/boot/dts/stm32mp157c.dtsi
@@ -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;
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/4] ARM: dts: stm32: change default minimal buck1 value on stm32mp157
2019-10-11 14:04 [PATCH 0/4] update regulator configuration for stm32mp157 boards Pascal Paillet
2019-10-11 14:04 ` [PATCH 1/4] ARM: dts: stm32: add PWR regulators support on stm32mp157 Pascal Paillet
@ 2019-10-11 14:04 ` Pascal Paillet
2019-10-11 14:04 ` [PATCH 3/4] ARM: dts: stm32: Fix active discharge usage " Pascal Paillet
2 siblings, 0 replies; 6+ messages in thread
From: Pascal Paillet @ 2019-10-11 14:04 UTC (permalink / raw)
To: mcoquelin.stm32, alexandre.torgue, robh+dt, mark.rutland,
linux-stm32, linux-arm-kernel, devicetree, linux-kernel
Cc: p.paillet
Minimal value is the value set during boot or before suspend.
We must ensure that the value is a functional value to boot.
Signed-off-by: Pascal Paillet <p.paillet@st.com>
---
arch/arm/boot/dts/stm32mp157a-dk1.dts | 2 +-
arch/arm/boot/dts/stm32mp157c-ed1.dts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/stm32mp157a-dk1.dts b/arch/arm/boot/dts/stm32mp157a-dk1.dts
index 26fb7c77092c..efeefb3d25b0 100644
--- a/arch/arm/boot/dts/stm32mp157a-dk1.dts
+++ b/arch/arm/boot/dts/stm32mp157a-dk1.dts
@@ -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>;
diff --git a/arch/arm/boot/dts/stm32mp157c-ed1.dts b/arch/arm/boot/dts/stm32mp157c-ed1.dts
index 1dbcc580e43c..15afa8f1a36f 100644
--- a/arch/arm/boot/dts/stm32mp157c-ed1.dts
+++ b/arch/arm/boot/dts/stm32mp157c-ed1.dts
@@ -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>;
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/4] ARM: dts: stm32: Fix active discharge usage on stm32mp157
2019-10-11 14:04 [PATCH 0/4] update regulator configuration for stm32mp157 boards Pascal Paillet
2019-10-11 14:04 ` [PATCH 1/4] ARM: dts: stm32: add PWR regulators support on stm32mp157 Pascal Paillet
2019-10-11 14:04 ` [PATCH 2/4] ARM: dts: stm32: change default minimal buck1 value " Pascal Paillet
@ 2019-10-11 14:04 ` Pascal Paillet
2 siblings, 0 replies; 6+ messages in thread
From: Pascal Paillet @ 2019-10-11 14:04 UTC (permalink / raw)
To: mcoquelin.stm32, alexandre.torgue, robh+dt, mark.rutland,
linux-stm32, linux-arm-kernel, devicetree, linux-kernel
Cc: p.paillet
Active discharge is a uint32 not a boolean.
Signed-off-by: Pascal Paillet <p.paillet@st.com>
---
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(-)
diff --git a/arch/arm/boot/dts/stm32mp157a-avenger96.dts b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
index 5f35b0146017..d1cc42a92d3f 100644
--- a/arch/arm/boot/dts/stm32mp157a-avenger96.dts
+++ b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
@@ -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>;
};
};
diff --git a/arch/arm/boot/dts/stm32mp157a-dk1.dts b/arch/arm/boot/dts/stm32mp157a-dk1.dts
index efeefb3d25b0..0e80f8da28d4 100644
--- a/arch/arm/boot/dts/stm32mp157a-dk1.dts
+++ b/arch/arm/boot/dts/stm32mp157a-dk1.dts
@@ -351,7 +351,7 @@
vbus_sw: pwr_sw2 {
regulator-name = "vbus_sw";
interrupts = <IT_OCP_SWOUT 0>;
- regulator-active-discharge;
+ regulator-active-discharge = <1>;
};
};
diff --git a/arch/arm/boot/dts/stm32mp157c-ed1.dts b/arch/arm/boot/dts/stm32mp157c-ed1.dts
index 15afa8f1a36f..108612b523de 100644
--- a/arch/arm/boot/dts/stm32mp157c-ed1.dts
+++ b/arch/arm/boot/dts/stm32mp157c-ed1.dts
@@ -225,7 +225,7 @@
vbus_sw: pwr_sw2 {
regulator-name = "vbus_sw";
interrupts = <IT_OCP_SWOUT 0>;
- regulator-active-discharge;
+ regulator-active-discharge = <1>;
};
};
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 0/4] update regulator configuration for stm32mp157 boards
@ 2019-10-11 14:05 Pascal Paillet
2019-10-25 10:09 ` Alexandre Torgue
0 siblings, 1 reply; 6+ messages in thread
From: Pascal Paillet @ 2019-10-11 14:05 UTC (permalink / raw)
To: mcoquelin.stm32, alexandre.torgue, robh+dt, mark.rutland,
linux-stm32, linux-arm-kernel, devicetree, linux-kernel
Cc: p.paillet
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(-)
--
2.17.1
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 0/4] update regulator configuration for stm32mp157 boards
2019-10-11 14:05 [PATCH 0/4] update regulator configuration for stm32mp157 boards Pascal Paillet
@ 2019-10-25 10:09 ` Alexandre Torgue
0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Torgue @ 2019-10-25 10:09 UTC (permalink / raw)
To: Pascal Paillet, mcoquelin.stm32, robh+dt, mark.rutland,
linux-stm32, linux-arm-kernel, devicetree, linux-kernel
Hi Pascal
On 10/11/19 4:05 PM, Pascal Paillet wrote:
> 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(-)
>
Series applied on stm32-next.
Regards
Alex
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-10-25 10:09 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-11 14:04 [PATCH 0/4] update regulator configuration for stm32mp157 boards Pascal Paillet
2019-10-11 14:04 ` [PATCH 1/4] ARM: dts: stm32: add PWR regulators support on stm32mp157 Pascal Paillet
2019-10-11 14:04 ` [PATCH 2/4] ARM: dts: stm32: change default minimal buck1 value " Pascal Paillet
2019-10-11 14:04 ` [PATCH 3/4] ARM: dts: stm32: Fix active discharge usage " Pascal Paillet
2019-10-11 14:05 [PATCH 0/4] update regulator configuration for stm32mp157 boards Pascal Paillet
2019-10-25 10:09 ` Alexandre Torgue
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).