diff mbox series

ARM: dts: stm32: Fix AV96 and DHCOR split

Message ID 20200427111602.382641-1-marex@denx.de
State Accepted
Commit 1ca501741831e3ab8366ddd4d7f74f27e5fe14c6
Delegated to: Patrick Delaunay
Headers show
Series ARM: dts: stm32: Fix AV96 and DHCOR split | expand

Commit Message

Marek Vasut April 27, 2020, 11:16 a.m. UTC
The commit 132e5b68986d ("ARM: dts: stm32: Split AV96 into DHCOR SoM
and AV96 board") was not applied correctly and in full, and omitted
an important split of the SoM into 3V3 and 1V8 options. The Avenger96
board is based on the 1V8 IO option of the DHCOR SoM, however this is
an optional modification of the 3V3 IO DHCOR SoM with extra on-SoM
regulator to cater for the 96boards 1V8 IO requirements.

Reinstate the split between the 1V8 and 3V3 IO variants.

Fixes: 132e5b68986d ("ARM: dts: stm32: Split AV96 into DHCOR SoM and AV96 board")
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
---
 arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts  |  2 +-
 arch/arm/dts/stm32mp15xx-dhcor-io1v8.dtsi     | 24 +++++++++++++++++++
 ...hcor.dtsi => stm32mp15xx-dhcor-io3v3.dtsi} | 13 +---------
 3 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100644 arch/arm/dts/stm32mp15xx-dhcor-io1v8.dtsi
 rename arch/arm/dts/{stm32mp15xx-dhcor.dtsi => stm32mp15xx-dhcor-io3v3.dtsi} (94%)

Comments

Patrick Delaunay April 28, 2020, 8:44 a.m. UTC | #1
Dear Marek,

> From: Marek Vasut <marex@denx.de>
> Sent: lundi 27 avril 2020 13:16
> 
> The commit 132e5b68986d ("ARM: dts: stm32: Split AV96 into DHCOR SoM and
> AV96 board") was not applied correctly and in full, and omitted an important split
> of the SoM into 3V3 and 1V8 options. The Avenger96 board is based on the 1V8
> IO option of the DHCOR SoM, however this is an optional modification of the 3V3
> IO DHCOR SoM with extra on-SoM regulator to cater for the 96boards 1V8 IO
> requirements.
> 
> Reinstate the split between the 1V8 and 3V3 IO variants.
> 
> Fixes: 132e5b68986d ("ARM: dts: stm32: Split AV96 into DHCOR SoM and AV96
> board")
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> Cc: Patrick Delaunay <patrick.delaunay@st.com>
> Cc: Patrice Chotard <patrice.chotard@st.com>
> ---
>  arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts  |  2 +-
>  arch/arm/dts/stm32mp15xx-dhcor-io1v8.dtsi     | 24 +++++++++++++++++++
>  ...hcor.dtsi => stm32mp15xx-dhcor-io3v3.dtsi} | 13 +---------
>  3 files changed, 26 insertions(+), 13 deletions(-)  create mode 100644
> arch/arm/dts/stm32mp15xx-dhcor-io1v8.dtsi
>  rename arch/arm/dts/{stm32mp15xx-dhcor.dtsi => stm32mp15xx-dhcor-
> io3v3.dtsi} (94%)
>

Reviewed-by: Patrick Delaunay <patrick.delaunay@st.com>

Thanks

Patrick
Patrick Delaunay May 14, 2020, 9:33 a.m. UTC | #2
Hi,

> From: Marek Vasut <marex@denx.de>
> Sent: lundi 27 avril 2020 13:16
> 
> The commit 132e5b68986d ("ARM: dts: stm32: Split AV96 into DHCOR SoM and
> AV96 board") was not applied correctly and in full, and omitted an important split
> of the SoM into 3V3 and 1V8 options. The Avenger96 board is based on the 1V8
> IO option of the DHCOR SoM, however this is an optional modification of the 3V3
> IO DHCOR SoM with extra on-SoM regulator to cater for the 96boards 1V8 IO
> requirements.
> 
> Reinstate the split between the 1V8 and 3V3 IO variants.
> 
> Fixes: 132e5b68986d ("ARM: dts: stm32: Split AV96 into DHCOR SoM and AV96
> board")
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> Cc: Patrick Delaunay <patrick.delaunay@st.com>
> Cc: Patrice Chotard <patrice.chotard@st.com>
> ---
>  arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts  |  2 +-
>  arch/arm/dts/stm32mp15xx-dhcor-io1v8.dtsi     | 24 +++++++++++++++++++
>  ...hcor.dtsi => stm32mp15xx-dhcor-io3v3.dtsi} | 13 +---------
>  3 files changed, 26 insertions(+), 13 deletions(-)  create mode 100644
> arch/arm/dts/stm32mp15xx-dhcor-io1v8.dtsi
>  rename arch/arm/dts/{stm32mp15xx-dhcor.dtsi => stm32mp15xx-dhcor-
> io3v3.dtsi} (94%)
> 

Applied to u-boot-stm/master, thanks!

Regards

Patrick
diff mbox series

Patch

diff --git a/arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts b/arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts
index a600677563..1b0579c8ab 100644
--- a/arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts
+++ b/arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts
@@ -7,7 +7,7 @@ 
 
 /dts-v1/;
 
-#include "stm32mp15xx-dhcor.dtsi"
+#include "stm32mp15xx-dhcor-io1v8.dtsi"
 #include "stm32mp15xx-dhcor-avenger96-u-boot.dtsi"
 
 / {
diff --git a/arch/arm/dts/stm32mp15xx-dhcor-io1v8.dtsi b/arch/arm/dts/stm32mp15xx-dhcor-io1v8.dtsi
new file mode 100644
index 0000000000..75435424d6
--- /dev/null
+++ b/arch/arm/dts/stm32mp15xx-dhcor-io1v8.dtsi
@@ -0,0 +1,24 @@ 
+// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
+/*
+ * Copyright (C) 2020 Marek Vasut <marex@denx.de>
+ */
+
+#include "stm32mp15xx-dhcor-io3v3.dtsi"
+
+/ {
+	/* Enpirion EP3A8LQI U2 on the 1V8 IO DHCOR */
+	vdd_io: regulator-buck-io {
+		compatible = "regulator-fixed";
+		regulator-name = "buck-io";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		regulator-always-on;
+		regulator-boot-on;
+		vin-supply = <&vdd>;
+	};
+};
+
+&pwr_regulators {
+	vdd-supply = <&vdd_io>;
+	vdd_3v3_usbfs-supply = <&vdd_usb>;
+};
diff --git a/arch/arm/dts/stm32mp15xx-dhcor.dtsi b/arch/arm/dts/stm32mp15xx-dhcor-io3v3.dtsi
similarity index 94%
rename from arch/arm/dts/stm32mp15xx-dhcor.dtsi
rename to arch/arm/dts/stm32mp15xx-dhcor-io3v3.dtsi
index 97d370e119..248fc455e3 100644
--- a/arch/arm/dts/stm32mp15xx-dhcor.dtsi
+++ b/arch/arm/dts/stm32mp15xx-dhcor-io3v3.dtsi
@@ -21,17 +21,6 @@ 
 		device_type = "memory";
 		reg = <0xc0000000 0x40000000>;
 	};
-
-	/* Enpirion EP3A8LQI U2 on the DHCOR */
-	vdd_io: regulator-buck-io {
-		compatible = "regulator-fixed";
-		regulator-name = "buck-io";
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <1800000>;
-		regulator-always-on;
-		regulator-boot-on;
-		vin-supply = <&vdd>;
-	};
 };
 
 &i2c4 {
@@ -200,7 +189,7 @@ 
 };
 
 &pwr_regulators {
-	vdd-supply = <&vdd_io>;
+	vdd-supply = <&vdd>;
 	vdd_3v3_usbfs-supply = <&vdd_usb>;
 };