Skip to contentSkip to conversation

arm: dts: stm32mp15: alignment with v5.11-rc2

PATCH New Patrick Delaunay 2 participants 5 messages Jan 11, 2021 – Feb 9, 2021

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

PATCH 1/1 arm: dts: stm32mp15: alignment with v5.11-rc2

Device tree alignment with Linux kernel v5.11-rc2
- fix DCMI DMA features on stm32mp15 family
- Add alternate pinmux for FMC EBI bus
- Harmonize EHCI/OHCI DT nodes name on stm32mp15
- update sdmmc IP version for STM32MP15
- Add LP timer irqs on stm32mp151
- Add LP timer wakeup-source on stm32mp151
- enable HASH by default on stm32mp15
- enable CRC1 by default on stm32mp15
- enable CRYP by default on stm32mp15
- set bus-type in DCMI endpoint for stm32mp157c-ev1 board
- reorder spi4 within stm32mp15-pinctrl
- add STUSB1600 Type-C using I2C4 on stm32mp15xx-dkx
- fix mdma1 clients channel priority level on stm32mp151
- fix dmamux reg property on stm32mp151
- adjust USB OTG gadget fifo sizes in stm32mp151
- update stm32mp151 for remote proc synchronization support
- support child mfd cells for the stm32mp1 TAMP syscon

---

 arch/arm/dts/stm32mp15-pinctrl.dtsi        | 87 +++++++++++++++++++++-
 arch/arm/dts/stm32mp151.dtsi               | 48 +++++++++---
 arch/arm/dts/stm32mp153.dtsi               |  6 ++
 arch/arm/dts/stm32mp157c-dk2.dts           |  4 +
 arch/arm/dts/stm32mp157c-ed1.dts           | 27 +++++++
 arch/arm/dts/stm32mp157c-ev1.dts           |  1 +
 arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi | 55 --------------
 arch/arm/dts/stm32mp15xx-dkx.dtsi          | 47 ++++++++++--
 8 files changed, 200 insertions(+), 75 deletions(-)
arch/arm/dts/stm32mp15-pinctrl.dtsi +84 -3
index 154832983c..dd4bd1e554 100644
@@ -349,6 +349,61 @@
 		};
 	};
 
+	fmc_pins_b: fmc-1 {
+		pins {
+			pinmux = <STM32_PINMUX('D', 4, AF12)>, /* FMC_NOE */
+				 <STM32_PINMUX('D', 5, AF12)>, /* FMC_NWE */
+				 <STM32_PINMUX('B', 7, AF12)>, /* FMC_NL */
+				 <STM32_PINMUX('D', 14, AF12)>, /* FMC_D0 */
+				 <STM32_PINMUX('D', 15, AF12)>, /* FMC_D1 */
+				 <STM32_PINMUX('D', 0, AF12)>, /* FMC_D2 */
+				 <STM32_PINMUX('D', 1, AF12)>, /* FMC_D3 */
+				 <STM32_PINMUX('E', 7, AF12)>, /* FMC_D4 */
+				 <STM32_PINMUX('E', 8, AF12)>, /* FMC_D5 */
+				 <STM32_PINMUX('E', 9, AF12)>, /* FMC_D6 */
+				 <STM32_PINMUX('E', 10, AF12)>, /* FMC_D7 */
+				 <STM32_PINMUX('E', 11, AF12)>, /* FMC_D8 */
+				 <STM32_PINMUX('E', 12, AF12)>, /* FMC_D9 */
+				 <STM32_PINMUX('E', 13, AF12)>, /* FMC_D10 */
+				 <STM32_PINMUX('E', 14, AF12)>, /* FMC_D11 */
+				 <STM32_PINMUX('E', 15, AF12)>, /* FMC_D12 */
+				 <STM32_PINMUX('D', 8, AF12)>, /* FMC_D13 */
+				 <STM32_PINMUX('D', 9, AF12)>, /* FMC_D14 */
+				 <STM32_PINMUX('D', 10, AF12)>, /* FMC_D15 */
+				 <STM32_PINMUX('G', 9, AF12)>, /* FMC_NE2_FMC_NCE */
+				 <STM32_PINMUX('G', 12, AF12)>; /* FMC_NE4 */
+			bias-disable;
+			drive-push-pull;
+			slew-rate = <3>;
+		};
+	};
+
+	fmc_sleep_pins_b: fmc-sleep-1 {
+		pins {
+			pinmux = <STM32_PINMUX('D', 4, ANALOG)>, /* FMC_NOE */
+				 <STM32_PINMUX('D', 5, ANALOG)>, /* FMC_NWE */
+				 <STM32_PINMUX('B', 7, ANALOG)>, /* FMC_NL */
+				 <STM32_PINMUX('D', 14, ANALOG)>, /* FMC_D0 */
+				 <STM32_PINMUX('D', 15, ANALOG)>, /* FMC_D1 */
+				 <STM32_PINMUX('D', 0, ANALOG)>, /* FMC_D2 */
+				 <STM32_PINMUX('D', 1, ANALOG)>, /* FMC_D3 */
+				 <STM32_PINMUX('E', 7, ANALOG)>, /* FMC_D4 */
+				 <STM32_PINMUX('E', 8, ANALOG)>, /* FMC_D5 */
+				 <STM32_PINMUX('E', 9, ANALOG)>, /* FMC_D6 */
+				 <STM32_PINMUX('E', 10, ANALOG)>, /* FMC_D7 */
+				 <STM32_PINMUX('E', 11, ANALOG)>, /* FMC_D8 */
+				 <STM32_PINMUX('E', 12, ANALOG)>, /* FMC_D9 */
+				 <STM32_PINMUX('E', 13, ANALOG)>, /* FMC_D10 */
+				 <STM32_PINMUX('E', 14, ANALOG)>, /* FMC_D11 */
+				 <STM32_PINMUX('E', 15, ANALOG)>, /* FMC_D12 */
+				 <STM32_PINMUX('D', 8, ANALOG)>, /* FMC_D13 */
+				 <STM32_PINMUX('D', 9, ANALOG)>, /* FMC_D14 */
+				 <STM32_PINMUX('D', 10, ANALOG)>, /* FMC_D15 */
+				 <STM32_PINMUX('G', 9, ANALOG)>, /* FMC_NE2_FMC_NCE */
+				 <STM32_PINMUX('G', 12, ANALOG)>; /* FMC_NE4 */
+		};
+	};
+
 	i2c1_pins_a: i2c1-0 {
 		pins {
 			pinmux = <STM32_PINMUX('D', 12, AF5)>, /* I2C1_SCL */
@@ -1437,6 +1492,24 @@
 		};
 	};
 
+	sdmmc2_d47_pins_d: sdmmc2-d47-3 {
+		pins {
+			pinmux = <STM32_PINMUX('A', 8, AF9)>, /* SDMMC2_D4 */
+				 <STM32_PINMUX('A', 9, AF10)>, /* SDMMC2_D5 */
+				 <STM32_PINMUX('E', 5, AF9)>, /* SDMMC2_D6 */
+				 <STM32_PINMUX('C', 7, AF10)>; /* SDMMC2_D7 */
+		};
+	};
+
+	sdmmc2_d47_sleep_pins_d: sdmmc2-d47-sleep-3 {
+		pins {
+			pinmux = <STM32_PINMUX('A', 8, ANALOG)>, /* SDMMC2_D4 */
+				 <STM32_PINMUX('A', 9, ANALOG)>, /* SDMMC2_D5 */
+				 <STM32_PINMUX('E', 5, ANALOG)>, /* SDMMC2_D6 */
+				 <STM32_PINMUX('C', 7, ANALOG)>; /* SDMMC2_D7 */
+		};
+	};
+
 	sdmmc3_b4_pins_a: sdmmc3-b4-0 {
 		pins1 {
 			pinmux = <STM32_PINMUX('F', 0, AF9)>, /* SDMMC3_D0 */
@@ -1588,9 +1661,9 @@
 	};
 
 	stusb1600_pins_a: stusb1600-0 {
-			pins {
-				pinmux = <STM32_PINMUX('I', 11, ANALOG)>;
-				bias-pull-up;
+		pins {
+			pinmux = <STM32_PINMUX('I', 11, ANALOG)>;
+			bias-pull-up;
 		};
 	};
 
@@ -1721,6 +1794,14 @@
 		};
 	};
 
+	uart8_rtscts_pins_a: uart8rtscts-0 {
+		pins {
+			pinmux = <STM32_PINMUX('G', 7, AF8)>, /* UART8_RTS */
+				 <STM32_PINMUX('G', 10, AF8)>; /* UART8_CTS */
+			bias-disable;
+		};
+	};
+
 	usart2_pins_a: usart2-0 {
 		pins1 {
 			pinmux = <STM32_PINMUX('F', 5, AF7)>, /* USART2_TX */
arch/arm/dts/stm32mp151.dtsi +36 -12

167 lines not on this page · raw message

arch/arm/dts/stm32mp153.dtsi +6 -0
index 6d9ab08667..1c1889b194 100644
@@ -16,6 +16,12 @@
 		};
 	};
 
+	arm-pmu {
+		interrupts = <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-affinity = <&cpu0>, <&cpu1>;
+	};
+
 	soc {
 		m_can1: can at 4400e000 {
 			compatible = "bosch,m_can";
arch/arm/dts/stm32mp157c-dk2.dts +4 -0
index 045636555d..2bc92ef3ae 100644
@@ -29,6 +29,10 @@
 	};
 };
 
+&cryp1 {
+	status = "okay";
+};
+
 &dsi {
 	status = "okay";
 	phy-dsi-supply = <&reg18>;
arch/arm/dts/stm32mp157c-ed1.dts +27 -0
index dd911c9932..6e89f88a17 100644
@@ -89,6 +89,14 @@
 		states = <1800000 0x1>,
 			 <2900000 0x0>;
 	};
+
+	vin: vin {
+		compatible = "regulator-fixed";
+		regulator-name = "vin";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		regulator-always-on;
+	};
 };
 
 &adc {
@@ -115,6 +123,14 @@
 	cpu-supply = <&vddcore>;
 };
 
+&crc1 {
+	status = "okay";
+};
+
+&cryp1 {
+	status = "okay";
+};
+
 &dac {
 	pinctrl-names = "default";
 	pinctrl-0 = <&dac_ch1_pins_a &dac_ch2_pins_a>;
@@ -136,6 +152,10 @@
 	contiguous-area = <&gpu_reserved>;
 };
 
+&hash1 {
+	status = "okay";
+};
+
 &i2c4 {
 	pinctrl-names = "default", "sleep";
 	pinctrl-0 = <&i2c4_pins_a>;
@@ -158,11 +178,18 @@
 
 		regulators {
 			compatible = "st,stpmic1-regulators";
+			buck1-supply = <&vin>;
+			buck2-supply = <&vin>;
+			buck3-supply = <&vin>;
+			buck4-supply = <&vin>;
 			ldo1-supply = <&v3v3>;
 			ldo2-supply = <&v3v3>;
 			ldo3-supply = <&vdd_ddr>;
+			ldo4-supply = <&vin>;
 			ldo5-supply = <&v3v3>;
 			ldo6-supply = <&v3v3>;
+			vref_ddr-supply = <&vin>;
+			boost-supply = <&vin>;
 			pwr_sw1-supply = <&bst_out>;
 			pwr_sw2-supply = <&bst_out>;
 
arch/arm/dts/stm32mp157c-ev1.dts +1 -0
index a55e80ce26..5c5b1ddf7b 100644
@@ -90,6 +90,7 @@
 	port {
 		dcmi_0: endpoint {
 			remote-endpoint = <&ov5640_0>;
+			bus-type = <5>;
 			bus-width = <8>;
 			hsync-active = <0>;
 			vsync-active = <0>;
arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi +0 -55

61 lines not on this page · raw message

arch/arm/dts/stm32mp15xx-dkx.dtsi +42 -5

96 lines not on this page · raw message

Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 arm: dts: stm32mp15: alignment with v5.11-rc2

Quoted 10 lines · Patrick Delaunay

Device tree alignment with Linux kernel v5.11-rc2
- fix DCMI DMA features on stm32mp15 family
- Add alternate pinmux for FMC EBI bus
- Harmonize EHCI/OHCI DT nodes name on stm32mp15
- update sdmmc IP version for STM32MP15
- Add LP timer irqs on stm32mp151
- Add LP timer wakeup-source on stm32mp151
- enable HASH by default on stm32mp15
- enable CRC1 by default on stm32mp15
- enable CRYP by default on stm32mp15

Quoted 8 lines

- set bus-type in DCMI endpoint for stm32mp157c-ev1 board
- reorder spi4 within stm32mp15-pinctrl
- add STUSB1600 Type-C using I2C4 on stm32mp15xx-dkx
- fix mdma1 clients channel priority level on stm32mp151
- fix dmamux reg property on stm32mp151
- adjust USB OTG gadget fifo sizes in stm32mp151
- update stm32mp151 for remote proc synchronization support
- support child mfd cells for the stm32mp1 TAMP syscon

Are you completely sure the dhcom based boards generate the same DT after the sync ?

I would rather prefer sync with Linux 5.10 (LTS), or is that not an option due to some extra DT patches ?

Either way, if you have an upstream queue for this DT sync somewhere, please give me a link, I plan to sync the dhcom boards after 2021.01 is out, so I would build on top of that.

#2 lore raw

PATCH 1/1 arm: dts: stm32mp15: alignment with v5.11-rc2

Hi Marek,

Quoted 23 lines · Marek Vasut
Quoted 10 lines · Patrick Delaunay

Device tree alignment with Linux kernel v5.11-rc2
- fix DCMI DMA features on stm32mp15 family
- Add alternate pinmux for FMC EBI bus
- Harmonize EHCI/OHCI DT nodes name on stm32mp15
- update sdmmc IP version for STM32MP15
- Add LP timer irqs on stm32mp151
- Add LP timer wakeup-source on stm32mp151
- enable HASH by default on stm32mp15
- enable CRC1 by default on stm32mp15
- enable CRYP by default on stm32mp15

Quoted 8 lines

- set bus-type in DCMI endpoint for stm32mp157c-ev1 board
- reorder spi4 within stm32mp15-pinctrl
- add STUSB1600 Type-C using I2C4 on stm32mp15xx-dkx
- fix mdma1 clients channel priority level on stm32mp151
- fix dmamux reg property on stm32mp151
- adjust USB OTG gadget fifo sizes in stm32mp151
- update stm32mp151 for remote proc synchronization support
- support child mfd cells for the stm32mp1 TAMP syscon

Are you completely sure the dhcom based boards generate the same DT after the sync ?

Quoted 6 lines

I would rather prefer sync with Linux 5.10 (LTS), or is that not an option due to some extra DT patches ?

Either way, if you have an upstream queue for this DT sync somewhere, please give me a link, I plan to sync the dhcom boards after 2021.01 is out, so I would build on top of that.

I am sure the DT is not the same, sorry.

At least for the SOC part (new nodes, updates value).

I compare the dhcom device tree (dts file form dtb) and I don't found modifications except the phandle changes and the expected modifications.

But it is not a exhaustive check.

For ST boards, the U-Boot device trees are aligned with? Linux 5.9 since the commit 62f95af92a3fc21a72f5f3198f0d065cbd773f03 ("ARM: dts:
stm32mp1: DT alignment with Linux kernel v5.9-rc4")

I skip the Linux 5.10 (LTS) as it comes after v2020.10 merge windows and the 5.11 device tree are already updated (pull request from Alexandre Torgue =
https://kernel.googlesource.com/pub/scm/linux/kernel/git/atorgue/stm32)

But if you prefer I can split it in 2 steps

1/ Device tree alignment with Linux kernel v5.10 (LTS)

2/ Device tree alignment with Linux kernel v5.11-rc2

Today the patch is present in next branch of stm custodians
(https://gitlab.denx.de/u-boot/custodians/u-boot-stm/-/tree/next)

And I am preparing a pull request for the master branch.

Patrick

#3 lore raw

PATCH 1/1 arm: dts: stm32mp15: alignment with v5.11-rc2

Quoted 1 line · Patrick DELAUNAY

Hi Marek,

Hi,

Quoted 31 lines · Marek Vasut
Quoted 23 lines · Patrick Delaunay
Quoted 10 lines

Device tree alignment with Linux kernel v5.11-rc2
- fix DCMI DMA features on stm32mp15 family
- Add alternate pinmux for FMC EBI bus
- Harmonize EHCI/OHCI DT nodes name on stm32mp15
- update sdmmc IP version for STM32MP15
- Add LP timer irqs on stm32mp151
- Add LP timer wakeup-source on stm32mp151
- enable HASH by default on stm32mp15
- enable CRC1 by default on stm32mp15
- enable CRYP by default on stm32mp15

Quoted 8 lines

- set bus-type in DCMI endpoint for stm32mp157c-ev1 board
- reorder spi4 within stm32mp15-pinctrl
- add STUSB1600 Type-C using I2C4 on stm32mp15xx-dkx
- fix mdma1 clients channel priority level on stm32mp151
- fix dmamux reg property on stm32mp151
- adjust USB OTG gadget fifo sizes in stm32mp151
- update stm32mp151 for remote proc synchronization support
- support child mfd cells for the stm32mp1 TAMP syscon

Are you completely sure the dhcom based boards generate the same DT after the sync ?

Quoted 6 lines

I would rather prefer sync with Linux 5.10 (LTS), or is that not an option due to some extra DT patches ?

Either way, if you have an upstream queue for this DT sync somewhere, please give me a link, I plan to sync the dhcom boards after 2021.01 is out, so I would build on top of that.

Quoted 8 lines

I am sure the DT is not the same, sorry.

At least for the SOC part (new nodes, updates value).

I compare the dhcom device tree (dts file form dtb) and I don't found modifications except the phandle changes and the expected modifications.

But it is not a exhaustive check.

There is dtdiff, you can run it on the generated SPL and U-Boot DTBs before and after your changes. That should be a thorough check.

Quoted 11 lines

For ST boards, the U-Boot device trees are aligned with? Linux 5.9 since the commit 62f95af92a3fc21a72f5f3198f0d065cbd773f03 ("ARM: dts:
stm32mp1: DT alignment with Linux kernel v5.9-rc4")

I skip the Linux 5.10 (LTS) as it comes after v2020.10 merge windows and the 5.11 device tree are already updated (pull request from Alexandre Torgue =
https://kernel.googlesource.com/pub/scm/linux/kernel/git/atorgue/stm32)

But if you prefer I can split it in 2 steps

Quoted 8 lines

1/ Device tree alignment with Linux kernel v5.10 (LTS)

2/ Device tree alignment with Linux kernel v5.11-rc2

Today the patch is present in next branch of stm custodians
(https://gitlab.denx.de/u-boot/custodians/u-boot-stm/-/tree/next)

And I am preparing a pull request for the master branch.

Keep it as-is, I just wanted to know why you didn't pick the LTS option, now it's clear, thanks.

#4 lore raw

PATCH 1/1 arm: dts: stm32mp15: alignment with v5.11-rc2

In reply to Patrick Delaunay

Hi,

Quoted 23 lines · Patrick Delaunay

Device tree alignment with Linux kernel v5.11-rc2
- fix DCMI DMA features on stm32mp15 family
- Add alternate pinmux for FMC EBI bus
- Harmonize EHCI/OHCI DT nodes name on stm32mp15
- update sdmmc IP version for STM32MP15
- Add LP timer irqs on stm32mp151
- Add LP timer wakeup-source on stm32mp151
- enable HASH by default on stm32mp15
- enable CRC1 by default on stm32mp15
- enable CRYP by default on stm32mp15
- set bus-type in DCMI endpoint for stm32mp157c-ev1 board
- reorder spi4 within stm32mp15-pinctrl
- add STUSB1600 Type-C using I2C4 on stm32mp15xx-dkx
- fix mdma1 clients channel priority level on stm32mp151
- fix dmamux reg property on stm32mp151
- adjust USB OTG gadget fifo sizes in stm32mp151
- update stm32mp151 for remote proc synchronization support
- support child mfd cells for the stm32mp1 TAMP syscon

---

Quoted 10 lines
  arch/arm/dts/stm32mp15-pinctrl.dtsi        | 87 +++++++++++++++++++++-
  arch/arm/dts/stm32mp151.dtsi               | 48 +++++++++---
  arch/arm/dts/stm32mp153.dtsi               |  6 ++
  arch/arm/dts/stm32mp157c-dk2.dts           |  4 +
  arch/arm/dts/stm32mp157c-ed1.dts           | 27 +++++++
  arch/arm/dts/stm32mp157c-ev1.dts           |  1 +
  arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi | 55 --------------
  arch/arm/dts/stm32mp15xx-dkx.dtsi          | 47 ++++++++++--
  8 files changed, 200 insertions(+), 75 deletions(-)

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

Regards

Patrick