Skip to contentSkip to conversation

ARM: dts: stm32: Fix AV96 and DHCOR split

PATCH New Marek Vasut 2 participants 3 messages Apr 27, 2020 – May 14, 2020

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

PATCH 1/1 ARM: dts: stm32: Fix AV96 and DHCOR split

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")
Cc Manivannan Sadhasivam <[email protected]>
Cc Patrick Delaunay <[email protected]>
Cc Patrice Chotard <[email protected]>
---
 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%)
arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts +1 -1
index a600677563..1b0579c8ab 100644
@@ -7,7 +7,7 @@
 
 /dts-v1/;
 
-#include "stm32mp15xx-dhcor.dtsi"
+#include "stm32mp15xx-dhcor-io1v8.dtsi"
 #include "stm32mp15xx-dhcor-avenger96-u-boot.dtsi"
 
 / {
arch/arm/dts/stm32mp15xx-dhcor-io1v8.dtsi new file +24 -0
new file mode 100644
index 0000000000..75435424d6
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
+/*
+ * Copyright (C) 2020 Marek Vasut <[email protected]>
+ */
+
+#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>;
+};
arch/arm/dts/stm32mp15xx-dhcor-io3v3.dtsi renamed from arch/arm/dts/stm32mp15xx-dhcor.dtsi +1 -12
similarity index 94%
rename from arch/arm/dts/stm32mp15xx-dhcor.dtsi
rename to arch/arm/dts/stm32mp15xx-dhcor-io3v3.dtsi
index 97d370e119..248fc455e3 100644
@@ -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>;
 };
 
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 ARM: dts: stm32: Fix AV96 and DHCOR split

Dear Marek,

Quoted 18 lines

From: Marek Vasut <[email protected]>
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")

Cc Manivannan Sadhasivam <[email protected]>
Cc Patrick Delaunay <[email protected]>
Cc Patrice Chotard <[email protected]>
Quoted 9 lines
---
 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%)

Thanks

Patrick

#2 lore raw

PATCH 1/1 ARM: dts: stm32: Fix AV96 and DHCOR split

In reply to Marek Vasut

Hi,

Quoted 18 lines

From: Marek Vasut <[email protected]>
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")

Cc Manivannan Sadhasivam <[email protected]>
Cc Patrick Delaunay <[email protected]>
Cc Patrice Chotard <[email protected]>
Quoted 9 lines
---
 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