Skip to contentSkip to conversation

ARM: dts: STM32: MCU's DT update

PATCH New Patrice Chotard 2 participants 9 messages Nov 6, 2020 – Nov 25, 2020

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

cover ARM: dts: STM32: MCU's DT update

- Sync STM32 MCU's DT with kernel v5.10-rc1
- Fix typo
- Fix timer init
- Sync armv7-m.dtsi with kernel v5.10-rc1

Patrice Chotard (4):
ARM: dts: sync armv7-m.dtsi with kernel v5.10-rc1
ARM: dts: stm32: DT sync with kernel v5.10-rc1 for MCU's boards
ARM: dts: stm32: Fix timer initialization for stm32 MCU's board
ARM: dts: stm32: Fix typo in stm32h7-u-boot.dtsi

 arch/arm/dts/armv7-m.dtsi                |   4 +-
 arch/arm/dts/stm32429i-eval-u-boot.dtsi  |   6 +-
 arch/arm/dts/stm32429i-eval.dts          |  21 +++--
 arch/arm/dts/stm32746g-eval-u-boot.dtsi  |   4 +-
 arch/arm/dts/stm32746g-eval.dts          |  13 ++-
 arch/arm/dts/stm32f4-pinctrl.dtsi        | 107 ++++++++++++++++++++---
 arch/arm/dts/stm32f429-disco-u-boot.dtsi |   6 +-
 arch/arm/dts/stm32f429-disco.dts         |  99 ++++++++++++++++++++-
 arch/arm/dts/stm32f429.dtsi              |  30 +++++--
 arch/arm/dts/stm32f469-disco-u-boot.dtsi |  26 +++---
 arch/arm/dts/stm32f469-disco.dts         |  19 ++--
 arch/arm/dts/stm32f469.dtsi              |   1 -
 arch/arm/dts/stm32f7-pinctrl.dtsi        |  22 ++---
 arch/arm/dts/stm32f7-u-boot.dtsi         |   3 +-
 arch/arm/dts/stm32f746-disco-u-boot.dtsi |   8 +-
 arch/arm/dts/stm32f746-disco.dts         |   2 +-
 arch/arm/dts/stm32f746.dtsi              |  12 ++-
 arch/arm/dts/stm32f769-disco-u-boot.dtsi |   4 +-
 arch/arm/dts/stm32f769-disco.dts         |   6 +-
 arch/arm/dts/stm32h7-u-boot.dtsi         |   6 +-
 arch/arm/dts/stm32h743-pinctrl.dtsi      |  10 +--
 arch/arm/dts/stm32h743.dtsi              |  37 +++++---
 arch/arm/dts/stm32h743i-disco.dts        |   2 +-
 arch/arm/dts/stm32h743i-eval.dts         |   2 +-
 24 files changed, 334 insertions(+), 116 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/4 ARM: dts: sync armv7-m.dtsi with kernel v5.10-rc1

Since kernel v4.8-rc1, commit 05b23ebc2bd9 ("ARM: dts: armv7-m: remove skeleton.dtsi include"), skeleton.dtsi file is no more included.

This synchronization is needed to avoid to get 2 memory node in DTB file if, in DTS file, memory node is declared with the correct syntax as following:

	memory at 90000000 {

device_type = "memory";
reg = <0x90000000 0x800000>;
};

Then in DTB, we will have the 2 memory nodes, which is incorrect and cause misbehavior during DT parsing by U-boot:

	memory {
		device_type = "memory";
		reg = <0x00 0x00>;
	};

	memory at 90000000 {
		device_type = "memory";
		reg = <0x90000000 0x800000>;
	};

Issue found when synchronizing MCU's STM32 DT from kernel v5.10-rc1. When using fdtdec_setup_mem_size_base() or fdtdec_setup_memory_banksize() API, first above memory node is found (with reg = <0x00 0x00>), so gd->ram_size, gd->ram_base, gd->bd->bi_dram[bank].start and gd->bd->bi_dram[bank].size are all set to 0 which avoid boards to boot.

---

 arch/arm/dts/armv7-m.dtsi | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
arch/arm/dts/armv7-m.dtsi +1 -3
index 31349da75a..26f5443d85 100644
@@ -1,5 +1,4 @@
-#include "skeleton.dtsi"
-
+// SPDX-License-Identifier: GPL-2.0
 / {
 	nvic: interrupt-controller at e000e100  {
 		compatible = "arm,armv7m-nvic";
@@ -22,4 +21,3 @@
 		ranges;
 	};
 };
-
Signature · 1 line
2.17.1
#2 lore raw

PATCH 1/4 ARM: dts: sync armv7-m.dtsi with kernel v5.10-rc1

Hi Patrice

Quoted 56 lines

From: Patrice CHOTARD <[email protected]>
Sent: vendredi 6 novembre 2020 08:12

Since kernel v4.8-rc1, commit 05b23ebc2bd9 ("ARM: dts: armv7-m: remove skeleton.dtsi include"), skeleton.dtsi file is no more included.

This synchronization is needed to avoid to get 2 memory node in DTB file if, in DTS file, memory node is declared with the correct syntax as following:

	memory at 90000000 {
(quoted diff) +0 -0
 		device_type = "memory";
 		reg = <0x90000000 0x800000>;
 	};

Then in DTB, we will have the 2 memory nodes, which is incorrect and cause misbehavior during DT parsing by U-boot:

	memory {
		device_type = "memory";
		reg = <0x00 0x00>;
	};

	memory at 90000000 {
		device_type = "memory";
		reg = <0x90000000 0x800000>;
	};

Issue found when synchronizing MCU's STM32 DT from kernel v5.10-rc1. When using fdtdec_setup_mem_size_base() or fdtdec_setup_memory_banksize() API, first above memory node is found (with reg = <0x00 0x00>), so gd->ram_size, gd->ram_base, gd->bd->bi_dram[bank].start and gd->bd->bi_dram[bank].size are all set to 0 which avoid boards to boot.

---

 arch/arm/dts/armv7-m.dtsi | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
arch/arm/dts/armv7-m.dtsi index renamed from arch/arm/dts/armv7-m.dtsi +0 -0

31349da75a..26f5443d85 100644

arch/arm/dts/armv7-m.dtsi +1 -4
@@ -1,5 +1,4 @@
-#include "skeleton.dtsi"
-
+// SPDX-License-Identifier: GPL-2.0
 / {
 	nvic: interrupt-controller at e000e100  {
 		compatible = "arm,armv7m-nvic";
@@ -22,4 +21,3 @@
 		ranges;
 	};
 };
-
--
Quoted 1 line

2.17.1

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

Thanks

Patrick

#3 lore raw

PATCH 2/4 ARM: dts: stm32: DT sync with kernel v5.10-rc1 for MCU's boards

In reply to Patrice Chotard

Device tree alignment with kernel v5.10-rc1.

---

 arch/arm/dts/stm32429i-eval-u-boot.dtsi  |   2 +-
 arch/arm/dts/stm32429i-eval.dts          |  21 +++--
 arch/arm/dts/stm32746g-eval-u-boot.dtsi  |   4 +-
 arch/arm/dts/stm32746g-eval.dts          |  13 ++-
 arch/arm/dts/stm32f4-pinctrl.dtsi        | 107 ++++++++++++++++++++---
 arch/arm/dts/stm32f429-disco-u-boot.dtsi |   2 +-
 arch/arm/dts/stm32f429-disco.dts         |  99 ++++++++++++++++++++-
 arch/arm/dts/stm32f429.dtsi              |  30 +++++--
 arch/arm/dts/stm32f469-disco-u-boot.dtsi |   6 +-
 arch/arm/dts/stm32f469-disco.dts         |  19 ++--
 arch/arm/dts/stm32f469.dtsi              |   1 -
 arch/arm/dts/stm32f7-pinctrl.dtsi        |  22 ++---
 arch/arm/dts/stm32f7-u-boot.dtsi         |   3 +-
 arch/arm/dts/stm32f746-disco-u-boot.dtsi |   4 +-
 arch/arm/dts/stm32f746-disco.dts         |   2 +-
 arch/arm/dts/stm32f746.dtsi              |  12 ++-
 arch/arm/dts/stm32f769-disco-u-boot.dtsi |   4 +-
 arch/arm/dts/stm32f769-disco.dts         |   6 +-
 arch/arm/dts/stm32h743-pinctrl.dtsi      |  10 +--
 arch/arm/dts/stm32h743.dtsi              |  37 +++++---
 arch/arm/dts/stm32h743i-disco.dts        |   2 +-
 arch/arm/dts/stm32h743i-eval.dts         |   2 +-
 22 files changed, 308 insertions(+), 100 deletions(-)
arch/arm/dts/stm32429i-eval-u-boot.dtsi +1 -1
index fe437bbfe2..1e7429b2c6 100644
@@ -136,7 +136,7 @@
 };
 
 &pinctrl {
-	usart1_pins_a: usart1 at 0	{
+	usart1_pins_a: usart1-0	{
 		u-boot,dm-pre-reloc;
 		pins1 {
 			u-boot,dm-pre-reloc;
arch/arm/dts/stm32429i-eval.dts +14 -7
index c5afa0c162..592b182c1a 100644
@@ -19,7 +19,7 @@
 		stdout-path = "serial0:115200n8";
 	};
 
-	memory {
+	memory at 00000000 {
 		device_type = "memory";
 		reg = <0x00000000 0x2000000>;
 	};
@@ -54,19 +54,26 @@
 		regulator-max-microvolt = <3300000>;
 	};
 
+	vdd_panel: vdd-panel {
+		compatible = "regulator-fixed";
+		regulator-name = "vdd_panel";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+	};
+
 	leds {
 		compatible = "gpio-leds";
-		green {
+		led-green {
 			gpios = <&gpiog 6 1>;
 			linux,default-trigger = "heartbeat";
 		};
-		orange {
+		led-orange {
 			gpios = <&gpiog 7 1>;
 		};
-		red {
+		led-red {
 			gpios = <&gpiog 10 1>;
 		};
-		blue {
+		led-blue {
 			gpios = <&gpiog 12 1>;
 		};
 	};
@@ -97,6 +104,7 @@
 
 	panel_rgb: panel-rgb {
 		compatible = "ampire,am-480272h3tmqw-t01h";
+		power-supply = <&vdd_panel>;
 		status = "okay";
 		port {
 			panel_in_rgb: endpoint {
@@ -191,9 +199,8 @@
 
 &ltdc {
 	status = "okay";
-	pinctrl-0 = <&ltdc_pins>;
+	pinctrl-0 = <&ltdc_pins_a>;
 	pinctrl-names = "default";
-	dma-ranges;
 
 	port {
 		ltdc_out_rgb: endpoint {
arch/arm/dts/stm32746g-eval-u-boot.dtsi +2 -2
index d5fb92795d..f2195a6c51 100644
@@ -165,7 +165,7 @@
 		};
 	};
 
-	usart1_pins_a: usart1 at 0	{
+	usart1_pins_a: usart1-0	{
 		u-boot,dm-pre-reloc;
 		pins1 {
 			u-boot,dm-pre-reloc;
@@ -178,7 +178,7 @@
 
 &qspi {
 	reg = <0xA0001000 0x1000>, <0x90000000 0x4000000>;
-	qflash0: n25q512a {
+	qflash0: n25q512a at 0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
arch/arm/dts/stm32746g-eval.dts +6 -7
index d77eb53c6a..9940cf1873 100644
@@ -19,7 +19,7 @@
 		stdout-path = "serial0:115200n8";
 	};
 
-	memory {
+	memory at c0000000 {
 		device_type = "memory";
 		reg = <0xc0000000 0x2000000>;
 	};
@@ -30,17 +30,17 @@
 
 	leds {
 		compatible = "gpio-leds";
-		green {
+		led-green {
 			gpios = <&gpiof 10 1>;
 			linux,default-trigger = "heartbeat";
 		};
-		orange {
+		led-orange {
 			gpios = <&stmfx_pinctrl 17 1>;
 		};
-		red {
+		led-red {
 			gpios = <&gpiob 7 1>;
 		};
-		blue {
+		led-blue {
 			gpios = <&stmfx_pinctrl 19 1>;
 		};
 	};
@@ -59,7 +59,6 @@
 
 	joystick {
 		compatible = "gpio-keys";
-		#size-cells = <0>;
 		pinctrl-0 = <&joystick_pins>;
 		pinctrl-names = "default";
 		button-0 {
@@ -130,7 +129,7 @@
 		interrupts = <8 IRQ_TYPE_EDGE_RISING>;
 		interrupt-parent = <&gpioi>;
 
-		stmfx_pinctrl: stmfx-pin-controller {
+		stmfx_pinctrl: pinctrl {
 			compatible = "st,stmfx-0300-pinctrl";
 			gpio-controller;
 			#gpio-cells = <2>;
arch/arm/dts/stm32f4-pinctrl.dtsi +93 -14

190 lines not on this page · raw message

arch/arm/dts/stm32f429-disco-u-boot.dtsi +1 -1
index 52f80320bc..77d5ea07bb 100644
@@ -123,7 +123,7 @@
 };
 
 &pinctrl {
-	usart1_pins_a: usart1 at 0	{
+	usart1_pins_a: usart1-0	{
 		u-boot,dm-pre-reloc;
 		pins1 {
 			u-boot,dm-pre-reloc;
arch/arm/dts/stm32f429-disco.dts +96 -3

131 lines not on this page · raw message

arch/arm/dts/stm32f429.dtsi +21 -9
index db0b82e89e..a81e916064 100644
@@ -39,7 +39,7 @@
 	};
 
 	soc {
-		romem: nvmem at 1fff7800 {
+		romem: efuse at 1fff7800 {
 			compatible = "st,stm32f4-otp";
 			reg = <0x1fff7800 0x400>;
 			#address-cells = <1>;
@@ -277,12 +277,10 @@
 			compatible = "st,stm32-rtc";
 			reg = <0x40002800 0x400>;
 			clocks = <&rcc 1 CLK_RTC>;
-			clock-names = "ck_rtc";
 			assigned-clocks = <&rcc 1 CLK_RTC>;
 			assigned-clock-parents = <&rcc 1 CLK_LSE>;
 			interrupt-parent = <&exti>;
 			interrupts = <17 1>;
-			interrupt-names = "alarm";
 			st,syscfg = <&pwrcfg 0x00 0x100>;
 			status = "disabled";
 		};
@@ -362,6 +360,18 @@
 			status = "disabled";
 		};
 
+		i2c3: i2c at 40005c00 {
+			compatible = "st,stm32f4-i2c";
+			reg = <0x40005c00 0x400>;
+			interrupts = <72>,
+				     <73>;
+			resets = <&rcc STM32F4_APB1_RESET(I2C3)>;
+			clocks = <&rcc 0 STM32F4_APB1_CLOCK(I2C3)>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+		};
+
 		dac: dac at 40007400 {
 			compatible = "st,stm32f4-dac-core";
 			reg = <0x40007400 0x400>;
@@ -374,14 +384,14 @@
 
 			dac1: dac at 1 {
 				compatible = "st,stm32-dac";
-				#io-channels-cells = <1>;
+				#io-channel-cells = <1>;
 				reg = <1>;
 				status = "disabled";
 			};
 
 			dac2: dac at 2 {
 				compatible = "st,stm32-dac";
-				#io-channels-cells = <1>;
+				#io-channel-cells = <1>;
 				reg = <2>;
 				status = "disabled";
 			};
@@ -546,8 +556,8 @@
 			status = "disabled";
 		};
 
-		syscfg: system-config at 40013800 {
-			compatible = "syscon";
+		syscfg: syscon at 40013800 {
+			compatible = "st,stm32-syscfg", "syscon";
 			reg = <0x40013800 0x400>;
 		};
 
@@ -620,6 +630,9 @@
 			reg = <0x40015000 0x400>;
 			interrupts = <85>;
 			clocks = <&rcc 0 STM32F4_APB2_CLOCK(SPI5)>;
+			dmas = <&dma2 3 2 0x400 0x0>,
+				<&dma2 4 2 0x400 0x0>;
+			dma-names = "rx", "tx";
 			status = "disabled";
 		};
 
@@ -634,7 +647,7 @@
 		};
 
 		pwrcfg: power-config at 40007000 {
-			compatible = "syscon";
+			compatible = "st,stm32-power-config", "syscon";
 			reg = <0x40007000 0x400>;
 		};
 
@@ -748,7 +761,6 @@
 		rng: rng at 50060800 {
 			compatible = "st,stm32-rng";
 			reg = <0x50060800 0x400>;
-			interrupts = <80>;
 			clocks = <&rcc 0 STM32F4_AHB2_CLOCK(RNG)>;
 
 		};
arch/arm/dts/stm32f469-disco-u-boot.dtsi +3 -3
index 5a89f13054..3cf3a6aa6f 100644
@@ -66,7 +66,7 @@
 		       };
 		};
 
-		qspi: quadspi at A0001000 {
+		qspi: spi at A0001000 {
 			compatible = "st,stm32f469-qspi";
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -220,7 +220,7 @@
 		};
 	};
 
-	usart3_pins_a: usart3 at 0	{
+	usart3_pins_a: usart3-0	{
 		u-boot,dm-pre-reloc;
 		pins1 {
 			u-boot,dm-pre-reloc;
@@ -245,7 +245,7 @@
 
 &qspi {
 	reg = <0xA0001000 0x1000>, <0x90000000 0x1000000>;
-	flash0: n25q128a {
+	flash0: n25q128a at 0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
arch/arm/dts/stm32f469-disco.dts +13 -6
index d50c38dc78..23d87ee27a 100644
@@ -19,7 +19,7 @@
 		stdout-path = "serial0:115200n8";
 	};
 
-	memory {
+	memory at 00000000 {
 		device_type = "memory";
 		reg = <0x00000000 0x1000000>;
 	};
@@ -35,23 +35,30 @@
 		regulator-max-microvolt = <3300000>;
 	};
 
+	vdd_dsi: vdd-dsi {
+		compatible = "regulator-fixed";
+		regulator-name = "vdd_dsi";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+	};
+
 	soc {
 		dma-ranges = <0xc0000000 0x0 0x10000000>;
 	};
 
 	leds {
 		compatible = "gpio-leds";
-		green {
+		led-green {
 			gpios = <&gpiog 6 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "heartbeat";
 		};
-		orange {
+		led-orange {
 			gpios = <&gpiod 4 GPIO_ACTIVE_LOW>;
 		};
-		red {
+		led-red {
 			gpios = <&gpiod 5 GPIO_ACTIVE_LOW>;
 		};
-		blue {
+		led-blue {
 			gpios = <&gpiok 3 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -114,6 +121,7 @@
 		compatible = "orisetech,otm8009a";
 		reg = <0>; /* dsi virtual channel (0..3) */
 		reset-gpios = <&gpioh 7 GPIO_ACTIVE_LOW>;
+		power-supply = <&vdd_dsi>;
 		status = "okay";
 
 		port {
@@ -125,7 +133,6 @@
 };
 
 &ltdc {
-	dma-ranges;
 	status = "okay";
 
 	port {
arch/arm/dts/stm32f469.dtsi +0 -1
index 69c862d973..5f6a7976bb 100644
@@ -8,7 +8,6 @@
 		dsi: dsi at 40016c00 {
 			compatible = "st,stm32-dsi";
 			reg = <0x40016c00 0x800>;
-			interrupts = <92>;
 			resets = <&rcc STM32F4_APB2_RESET(DSI)>;
 			reset-names = "apb";
 			clocks = <&rcc 1 CLK_F469_DSI>, <&clk_hse>;
arch/arm/dts/stm32f7-pinctrl.dtsi +11 -11
index 9314128df1..fe4cfda72a 100644
@@ -127,7 +127,7 @@
 				st,bank-name = "GPIOK";
 			};
 
-			cec_pins_a: cec at 0 {
+			cec_pins_a: cec-0 {
 				pins {
 					pinmux = <STM32_PINMUX('A', 15, AF4)>; /* HDMI CEC */
 					slew-rate = <0>;
@@ -136,7 +136,7 @@
 				};
 			};
 
-			usart1_pins_a: usart1 at 0 {
+			usart1_pins_a: usart1-0 {
 				pins1 {
 					pinmux = <STM32_PINMUX('A', 9, AF7)>; /* USART1_TX */
 					bias-disable;
@@ -149,7 +149,7 @@
 				};
 			};
 
-			usart1_pins_b: usart1 at 1 {
+			usart1_pins_b: usart1-1 {
 				pins1 {
 					pinmux = <STM32_PINMUX('A', 9, AF7)>; /* USART1_TX */
 					bias-disable;
@@ -162,7 +162,7 @@
 				};
 			};
 
-			i2c1_pins_b: i2c1 at 0 {
+			i2c1_pins_b: i2c1-0 {
 				pins {
 					pinmux = <STM32_PINMUX('B', 9, AF4)>, /* I2C1 SDA */
 						 <STM32_PINMUX('B', 8, AF4)>; /* I2C1 SCL */
@@ -172,7 +172,7 @@
 				};
 			};
 
-			usbotg_hs_pins_a: usbotg-hs at 0 {
+			usbotg_hs_pins_a: usbotg-hs-0 {
 				pins {
 					pinmux = <STM32_PINMUX('H', 4, AF10)>, /* OTG_HS_ULPI_NXT */
 						 <STM32_PINMUX('I', 11, AF10)>, /* OTG_HS_ULPI_DIR */
@@ -192,7 +192,7 @@
 				};
 			};
 
-			usbotg_hs_pins_b: usbotg-hs at 1 {
+			usbotg_hs_pins_b: usbotg-hs-1 {
 				pins {
 					pinmux = <STM32_PINMUX('H', 4, AF10)>, /* OTG_HS_ULPI_NXT */
 						 <STM32_PINMUX('C', 2, AF10)>, /* OTG_HS_ULPI_DIR */
@@ -212,7 +212,7 @@
 				};
 			};
 
-			usbotg_fs_pins_a: usbotg-fs at 0 {
+			usbotg_fs_pins_a: usbotg-fs-0 {
 				pins {
 					pinmux = <STM32_PINMUX('A', 10, AF10)>, /* OTG_FS_ID */
 						 <STM32_PINMUX('A', 11, AF10)>, /* OTG_FS_DM */
@@ -223,7 +223,7 @@
 				};
 			};
 
-			sdio_pins_a: sdio_pins_a at 0 {
+			sdio_pins_a: sdio-pins-a-0 {
 				pins {
 					pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1 D0 */
 						 <STM32_PINMUX('C', 9, AF12)>, /* SDMMC1 D1 */
@@ -236,7 +236,7 @@
 				};
 			};
 
-			sdio_pins_od_a: sdio_pins_od_a at 0 {
+			sdio_pins_od_a: sdio-pins-od-a-0 {
 				pins1 {
 					pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1 D0 */
 						 <STM32_PINMUX('C', 9, AF12)>, /* SDMMC1 D1 */
@@ -254,7 +254,7 @@
 				};
 			};
 
-			sdio_pins_b: sdio_pins_b at 0 {
+			sdio_pins_b: sdio-pins-b-0 {
 				pins {
 					pinmux = <STM32_PINMUX('G', 9, AF11)>, /* SDMMC2 D0 */
 						 <STM32_PINMUX('G', 10, AF11)>, /* SDMMC2 D1 */
@@ -267,7 +267,7 @@
 				};
 			};
 
-			sdio_pins_od_b: sdio_pins_od_b at 0 {
+			sdio_pins_od_b: sdio-pins-od-b-0 {
 				pins1 {
 					pinmux = <STM32_PINMUX('G', 9, AF11)>, /* SDMMC2 D0 */
 						 <STM32_PINMUX('G', 10, AF11)>, /* SDMMC2 D1 */
arch/arm/dts/stm32f7-u-boot.dtsi +1 -2
index 32613c9769..46bd1102df 100644
@@ -26,7 +26,6 @@
 			interrupt-names = "macirq", "eth_wake_irq";
 			snps,pbl = <8>;
 			snps,mixed-burst;
-			dma-ranges;
 			pinctrl-0 = <&ethernet_mii>;
 			phy-mode = "rmii";
 			phy-handle = <&phy0>;
@@ -43,7 +42,7 @@
 			};
 		};
 
-		qspi: quadspi at A0001000 {
+		qspi: spi at A0001000 {
 			compatible = "st,stm32f469-qspi";
 			#address-cells = <1>;
 			#size-cells = <0>;
arch/arm/dts/stm32f746-disco-u-boot.dtsi +2 -2
index d8f9d8dc5f..860dd77668 100644
@@ -212,7 +212,7 @@
 		};
 	};
 
-	usart1_pins_b: usart1 at 1	{
+	usart1_pins_b: usart1-1	{
 		u-boot,dm-pre-reloc;
 		pins1 {
 			u-boot,dm-pre-reloc;
@@ -229,7 +229,7 @@
 
 &qspi {
 	reg = <0xA0001000 0x1000>, <0x90000000 0x1000000>;
-	qflash0: n25q128a {
+	qflash0: n25q128a at 0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
arch/arm/dts/stm32f746-disco.dts +1 -1
index 4fef0164cf..9430dc08ec 100644
@@ -19,7 +19,7 @@
 		stdout-path = "serial0:115200n8";
 	};
 
-	memory {
+	memory at c0000000 {
 		device_type = "memory";
 		reg = <0xC0000000 0x800000>;
 	};
arch/arm/dts/stm32f746.dtsi +5 -7
index 3f312ab3a7..ba9b3cd03c 100644
@@ -264,12 +264,10 @@
 			compatible = "st,stm32-rtc";
 			reg = <0x40002800 0x400>;
 			clocks = <&rcc 1 CLK_RTC>;
-			clock-names = "ck_rtc";
 			assigned-clocks = <&rcc 1 CLK_RTC>;
 			assigned-clock-parents = <&rcc 1 CLK_LSE>;
 			interrupt-parent = <&exti>;
 			interrupts = <17 1>;
-			interrupt-names = "alarm";
 			st,syscfg = <&pwrcfg 0x00 0x100>;
 			status = "disabled";
 		};
@@ -461,8 +459,8 @@
 			status = "disabled";
 		};
 
-		syscfg: system-config at 40013800 {
-			compatible = "syscon";
+		syscfg: syscon at 40013800 {
+			compatible = "st,stm32-syscfg", "syscon";
 			reg = <0x40013800 0x400>;
 		};
 
@@ -529,7 +527,7 @@
 		};
 
 		pwrcfg: power-config at 40007000 {
-			compatible = "syscon";
+			compatible = "st,stm32-power-config", "syscon";
 			reg = <0x40007000 0x400>;
 		};
 
@@ -551,7 +549,7 @@
 			assigned-clock-rates = <1000000>;
 		};
 
-		dma1: dma at 40026000 {
+		dma1: dma-controller at 40026000 {
 			compatible = "st,stm32-dma";
 			reg = <0x40026000 0x400>;
 			interrupts = <11>,
@@ -567,7 +565,7 @@
 			status = "disabled";
 		};
 
-		dma2: dma at 40026400 {
+		dma2: dma-controller at 40026400 {
 			compatible = "st,stm32-dma";
 			reg = <0x40026400 0x400>;
 			interrupts = <56>,
arch/arm/dts/stm32f769-disco-u-boot.dtsi +2 -2
index c1d7d6b8f5..7dfe430a40 100644
@@ -215,7 +215,7 @@
 		};
 	};
 
-	usart1_pins_a: usart1 at 0	{
+	usart1_pins_a: usart1-0	{
 		u-boot,dm-pre-reloc;
 		pins1 {
 			u-boot,dm-pre-reloc;
@@ -228,7 +228,7 @@
 
 &qspi {
 	reg = <0xA0001000 0x1000>, <0x90000000 0x4000000>;
-	flash0: mx66l51235l {
+	flash0: mx66l51235l at 0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
arch/arm/dts/stm32f769-disco.dts +3 -3
index 8d51e5b0fb..03cfbd7cc2 100644
@@ -19,7 +19,7 @@
 		stdout-path = "serial0:115200n8";
 	};
 
-	memory {
+	memory at c0000000 {
 		device_type = "memory";
 		reg = <0xC0000000 0x1000000>;
 	};
@@ -30,11 +30,11 @@
 
 	leds {
 		compatible = "gpio-leds";
-		green {
+		led-green {
 			gpios = <&gpioj 5 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "heartbeat";
 		};
-		red {
+		led-red {
 			gpios = <&gpioj 13 GPIO_ACTIVE_HIGH>;
 		};
 	};
arch/arm/dts/stm32h743-pinctrl.dtsi +5 -5
index e3a5c537f3..141083f8d1 100644
@@ -163,7 +163,7 @@
 				#interrupt-cells = <2>;
 			};
 
-			i2c1_pins_a: i2c1 at 0 {
+			i2c1_pins_a: i2c1-0 {
 				pins {
 					pinmux = <STM32_PINMUX('B', 6, AF4)>, /* I2C1_SCL */
 						 <STM32_PINMUX('B', 7, AF4)>; /* I2C1_SDA */
@@ -173,7 +173,7 @@
 				};
 			};
 
-			ethernet_rmii: rmii at 0 {
+			ethernet_rmii: rmii-0 {
 				pins {
 					pinmux = <STM32_PINMUX('G', 11, AF11)>,
 						 <STM32_PINMUX('G', 13, AF11)>,
@@ -256,7 +256,7 @@
 				};
 			};
 
-			usart1_pins: usart1 at 0 {
+			usart1_pins: usart1-0 {
 				pins1 {
 					pinmux = <STM32_PINMUX('B', 14, AF4)>; /* USART1_TX */
 					bias-disable;
@@ -269,7 +269,7 @@
 				};
 			};
 
-			usart2_pins: usart2 at 0 {
+			usart2_pins: usart2-0 {
 				pins1 {
 					pinmux = <STM32_PINMUX('D', 5, AF7)>; /* USART2_TX */
 					bias-disable;
@@ -282,7 +282,7 @@
 				};
 			};
 
-			usbotg_hs_pins_a: usbotg-hs at 0 {
+			usbotg_hs_pins_a: usbotg-hs-0 {
 				pins {
 					pinmux = <STM32_PINMUX('H', 4, AF10)>,	/* ULPI_NXT */
 							 <STM32_PINMUX('I', 11, AF10)>, /* ULPI_DIR> */
arch/arm/dts/stm32h743.dtsi +26 -11
index 4b4e7a99f7..e4e472336b 100644
@@ -74,6 +74,7 @@
 			compatible = "st,stm32h7-spi";
 			reg = <0x40003800 0x400>;
 			interrupts = <36>;
+			resets = <&rcc STM32H7_APB1L_RESET(SPI2)>;
 			clocks = <&rcc SPI2_CK>;
 			status = "disabled";
 
@@ -85,12 +86,13 @@
 			compatible = "st,stm32h7-spi";
 			reg = <0x40003c00 0x400>;
 			interrupts = <51>;
+			resets = <&rcc STM32H7_APB1L_RESET(SPI3)>;
 			clocks = <&rcc SPI3_CK>;
 			status = "disabled";
 		};
 
 		usart2: serial at 40004400 {
-			compatible = "st,stm32f7-uart";
+			compatible = "st,stm32h7-uart";
 			reg = <0x40004400 0x400>;
 			interrupts = <38>;
 			status = "disabled";
@@ -144,21 +146,21 @@
 
 			dac1: dac at 1 {
 				compatible = "st,stm32-dac";
-				#io-channels-cells = <1>;
+				#io-channel-cells = <1>;
 				reg = <1>;
 				status = "disabled";
 			};
 
 			dac2: dac at 2 {
 				compatible = "st,stm32-dac";
-				#io-channels-cells = <1>;
+				#io-channel-cells = <1>;
 				reg = <2>;
 				status = "disabled";
 			};
 		};
 
 		usart1: serial at 40011000 {
-			compatible = "st,stm32f7-uart";
+			compatible = "st,stm32h7-uart";
 			reg = <0x40011000 0x400>;
 			interrupts = <37>;
 			status = "disabled";
@@ -171,6 +173,7 @@
 			compatible = "st,stm32h7-spi";
 			reg = <0x40013000 0x400>;
 			interrupts = <35>;
+			resets = <&rcc STM32H7_APB2_RESET(SPI1)>;
 			clocks = <&rcc SPI1_CK>;
 			status = "disabled";
 		};
@@ -181,6 +184,7 @@
 			compatible = "st,stm32h7-spi";
 			reg = <0x40013400 0x400>;
 			interrupts = <84>;
+			resets = <&rcc STM32H7_APB2_RESET(SPI4)>;
 			clocks = <&rcc SPI4_CK>;
 			status = "disabled";
 		};
@@ -191,11 +195,12 @@
 			compatible = "st,stm32h7-spi";
 			reg = <0x40015000 0x400>;
 			interrupts = <85>;
+			resets = <&rcc STM32H7_APB2_RESET(SPI5)>;
 			clocks = <&rcc SPI5_CK>;
 			status = "disabled";
 		};
 
-		dma1: dma at 40020000 {
+		dma1: dma-controller at 40020000 {
 			compatible = "st,stm32-dma";
 			reg = <0x40020000 0x400>;
 			interrupts = <11>,
@@ -213,7 +218,7 @@
 			status = "disabled";
 		};
 
-		dma2: dma at 40020400 {
+		dma2: dma-controller at 40020400 {
 			compatible = "st,stm32-dma";
 			reg = <0x40020400 0x400>;
 			interrupts = <56>,
@@ -293,7 +298,17 @@
 			status = "disabled";
 		};
 
-		mdma1: dma at 52000000 {
+		ltdc: display-controller at 50001000 {
+			compatible = "st,stm32-ltdc";
+			reg = <0x50001000 0x200>;
+			interrupts = <88>, <89>;
+			resets = <&rcc STM32H7_APB3_RESET(LTDC)>;
+			clocks = <&rcc LTDC_CK>;
+			clock-names = "lcd";
+			status = "disabled";
+		};
+
+		mdma1: dma-controller at 52000000 {
 			compatible = "st,stm32h7-mdma";
 			reg = <0x52000000 0x1000>;
 			interrupts = <122>;
@@ -325,8 +340,8 @@
 			interrupts = <1>, <2>, <3>, <6>, <7>, <8>, <9>, <10>, <23>, <40>, <41>, <62>, <76>;
 		};
 
-		syscfg: system-config at 58000400 {
-			compatible = "syscon";
+		syscfg: syscon at 58000400 {
+			compatible = "st,stm32-syscfg", "syscon";
 			reg = <0x58000400 0x400>;
 		};
 
@@ -336,6 +351,7 @@
 			compatible = "st,stm32h7-spi";
 			reg = <0x58001400 0x400>;
 			interrupts = <86>;
+			resets = <&rcc STM32H7_APB4_RESET(SPI6)>;
 			clocks = <&rcc SPI6_CK>;
 			status = "disabled";
 		};
@@ -451,7 +467,6 @@
 			assigned-clock-parents = <&rcc LSE_CK>;
 			interrupt-parent = <&exti>;
 			interrupts = <17 IRQ_TYPE_EDGE_RISING>;
-			interrupt-names = "alarm";
 			st,syscfg = <&pwrcfg 0x00 0x100>;
 			status = "disabled";
 		};
@@ -466,7 +481,7 @@
 		};
 
 		pwrcfg: power-config at 58024800 {
-			compatible = "syscon";
+			compatible = "st,stm32-power-config", "syscon";
 			reg = <0x58024800 0x400>;
 		};
 
arch/arm/dts/stm32h743i-disco.dts +1 -1
index 43c30bfcbe..81007161e7 100644
@@ -17,7 +17,7 @@
 		stdout-path = "serial0:115200n8";
 	};
 
-	memory {
+	memory at d0000000 {
 		device_type = "memory";
 		reg = <0xd0000000 0x2000000>;
 	};
arch/arm/dts/stm32h743i-eval.dts +1 -1
index e4d3c58f3d..8f398178f5 100644
@@ -53,7 +53,7 @@
 		stdout-path = "serial0:115200n8";
 	};
 
-	memory {
+	memory at d0000000 {
 		device_type = "memory";
 		reg = <0xd0000000 0x2000000>;
 	};
Signature · 1 line
2.17.1
#4 lore raw

PATCH 2/4 ARM: dts: stm32: DT sync with kernel v5.10-rc1 for MCU's boards

Hi Patrice,

Quoted 23 lines

From: Patrice CHOTARD <[email protected]>
Sent: vendredi 6 novembre 2020 08:12

Device tree alignment with kernel v5.10-rc1.

---

 arch/arm/dts/stm32429i-eval-u-boot.dtsi  |   2 +-
 arch/arm/dts/stm32429i-eval.dts          |  21 +++--
 arch/arm/dts/stm32746g-eval-u-boot.dtsi  |   4 +-
 arch/arm/dts/stm32746g-eval.dts          |  13 ++-
 arch/arm/dts/stm32f4-pinctrl.dtsi        | 107 ++++++++++++++++++++---
 arch/arm/dts/stm32f429-disco-u-boot.dtsi |   2 +-
 arch/arm/dts/stm32f429-disco.dts         |  99 ++++++++++++++++++++-
 arch/arm/dts/stm32f429.dtsi              |  30 +++++--
 arch/arm/dts/stm32f469-disco-u-boot.dtsi |   6 +-
 arch/arm/dts/stm32f469-disco.dts         |  19 ++--
 arch/arm/dts/stm32f469.dtsi              |   1 -
 arch/arm/dts/stm32f7-pinctrl.dtsi        |  22 ++---
 arch/arm/dts/stm32f7-u-boot.dtsi         |   3 +-
 arch/arm/dts/stm32f746-disco-u-boot.dtsi |   4 +-
 arch/arm/dts/stm32f746-disco.dts         |   2 +-
Quoted 9 lines
 arch/arm/dts/stm32f746.dtsi              |  12 ++-
 arch/arm/dts/stm32f769-disco-u-boot.dtsi |   4 +-
 arch/arm/dts/stm32f769-disco.dts         |   6 +-
 arch/arm/dts/stm32h743-pinctrl.dtsi      |  10 +--
 arch/arm/dts/stm32h743.dtsi              |  37 +++++---
 arch/arm/dts/stm32h743i-disco.dts        |   2 +-
 arch/arm/dts/stm32h743i-eval.dts         |   2 +-
 22 files changed, 308 insertions(+), 100 deletions(-)

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

Thanks

Patrick

#5 lore raw

PATCH 3/4 ARM: dts: stm32: Fix timer initialization for stm32 MCU's board

In reply to Patrice Chotard

Commit 4b2be78ab66c ("time: Fix get_ticks being non-monotonic") puts in evidence that get_ticks is called before timer initialization. Fix it by initializing timer before relocation.

---

 arch/arm/dts/stm32429i-eval-u-boot.dtsi  |  4 ++++
 arch/arm/dts/stm32f429-disco-u-boot.dtsi |  4 ++++
 arch/arm/dts/stm32f469-disco-u-boot.dtsi | 20 ++++++++++++--------
 arch/arm/dts/stm32f746-disco-u-boot.dtsi |  4 ----
 arch/arm/dts/stm32h7-u-boot.dtsi         |  4 ++++
 5 files changed, 24 insertions(+), 12 deletions(-)
arch/arm/dts/stm32429i-eval-u-boot.dtsi +4 -0
index 1e7429b2c6..e75cf99f8f 100644
@@ -217,3 +217,7 @@
 		};
 	};
 };
+
+&timer5 {
+	u-boot,dm-pre-reloc;
+};
arch/arm/dts/stm32f429-disco-u-boot.dtsi +4 -0
index 77d5ea07bb..df99e01393 100644
@@ -192,3 +192,7 @@
 &rcc {
 	u-boot,dm-pre-reloc;
 };
+
+&timer5 {
+	u-boot,dm-pre-reloc;
+};
arch/arm/dts/stm32f469-disco-u-boot.dtsi +12 -8
index 3cf3a6aa6f..7223ba4a60 100644
@@ -235,14 +235,6 @@
 	u-boot,dm-pre-reloc;
 };
 
-&rcc {
-	u-boot,dm-pre-reloc;
-};
-
-&syscfg {
-	u-boot,dm-pre-reloc;
-};
-
 &qspi {
 	reg = <0xA0001000 0x1000>, <0x90000000 0x1000000>;
 	flash0: n25q128a at 0 {
@@ -255,3 +247,15 @@
 		reg = <0>;
 	};
 };
+
+&rcc {
+	u-boot,dm-pre-reloc;
+};
+
+&syscfg {
+	u-boot,dm-pre-reloc;
+};
+
+&timer5 {
+	u-boot,dm-pre-reloc;
+};
arch/arm/dts/stm32f746-disco-u-boot.dtsi +0 -4
index 860dd77668..4f34fc9a8c 100644
@@ -239,7 +239,3 @@
 		reg = <0>;
 	};
 };
-
-&timer5 {
-	u-boot,dm-pre-reloc;
-};
arch/arm/dts/stm32h7-u-boot.dtsi +4 -0
index 361c8e5d80..7182533cc9 100644
@@ -218,3 +218,7 @@
 &sdmmc1 {
 	compatible = "st,stm32-sdmmc2", "arm,pl18x", "arm,primecell";
 };
+
+&timer5 {
+	u-boot,dm-pre-reloc;
+};
Signature · 1 line
2.17.1
#6 lore raw

PATCH 3/4 ARM: dts: stm32: Fix timer initialization for stm32 MCU's board

Hi Patrice

Quoted 7 lines

From: Patrice CHOTARD <[email protected]>
Sent: vendredi 6 novembre 2020 08:12

Commit 4b2be78ab66c ("time: Fix get_ticks being non-monotonic") puts in evidence that get_ticks is called before timer initialization. Fix it by initializing timer before relocation.

Quoted 9 lines

---

arch/arm/dts/stm32429i-eval-u-boot.dtsi | 4 ++++ arch/arm/dts/stm32f429-
disco-u-boot.dtsi | 4 ++++ arch/arm/dts/stm32f469-disco-u-boot.dtsi | 20 ++++++++++++-------- arch/arm/dts/stm32f746-disco-u-boot.dtsi | 4 ----

 arch/arm/dts/stm32h7-u-boot.dtsi         |  4 ++++
 5 files changed, 24 insertions(+), 12 deletions(-)

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

Thanks

Patrick

#7 lore raw

PATCH 4/4 ARM: dts: stm32: Fix typo in stm32h7-u-boot.dtsi

In reply to Patrice Chotard

Fix typo "firsct"

---

 arch/arm/dts/stm32h7-u-boot.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/stm32h7-u-boot.dtsi +1 -1
index 7182533cc9..54dd406b6b 100644
@@ -39,7 +39,7 @@
 
 			/*
 			 * Memory configuration from sdram datasheet IS42S32800G-6BLI
-			 * firsct bank is bank at 0
+			 * first bank is bank at 0
 			 * second bank is bank at 1
 			 */
 			bank1: bank at 1 {
Signature · 1 line
2.17.1
#8 lore raw

PATCH 4/4 ARM: dts: stm32: Fix typo in stm32h7-u-boot.dtsi

Hi Patrice

Quoted 27 lines

From: Patrice CHOTARD <[email protected]>
Sent: vendredi 6 novembre 2020 08:12

Fix typo "firsct"

---

 arch/arm/dts/stm32h7-u-boot.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/stm32h7-u-boot.dtsi +0 -0
index 7182533cc9..54dd406b6b 100644
@@ -39,7 +39,7 @@
 
 			/*
 			 * Memory configuration from sdram datasheet

IS42S32800G-6BLI

arch/arm/dts/stm32h7-u-boot.dtsi +1 -2
-			 * firsct bank is bank at 0
+			 * first bank is bank at 0
 			 * second bank is bank at 1
 			 */
 			bank1: bank at 1 {
--
Quoted 1 line

2.17.1

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

Thanks

Patrick