Skip to contentSkip to conversation

arm: dts: imx: sync device trees with upstream linux kernel part 1

PATCH Superseded Marcel Ziswiler 3 participants 12 messages Aug 26, 2022 – Oct 24, 2022

Subsystems (8)

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v2 cover arm: dts: imx: sync device trees with upstream linux kernel part 1

From: Marcel Ziswiler <[email protected]>

This series synchronises them imx device trees with the upstream Linux kernel (v6.0-rc1). I split it into two parts. This is part 1.

It also fixes a few issues as discussed during/after the pre-mature application of my first series [1].

I am not touching kontron-sl-mx6ul as Frieder already took care of those [2].

Feedback welcome. Thanks!

[1] https://patchwork.ozlabs.org/project/uboot/cover/[email protected]/
[2] https://patchwork.ozlabs.org/project/uboot/cover/[email protected]/

Changes in v2:
- imxrt1050: Re-added DDR timings aka semc node as pointed out by Fabio. Thanks!
- imx8ulp: Re-added s400_mu device tree node.

Marcel Ziswiler (8):
vf610: synchronise device tree with linux
imxrt1020: fix lpuart issue in common u-boot device tree
imxrt1050: synchronise device tree with linux
imx8ulp: synchronise device tree with linux
imx8mq: synchronise device tree with linux
imx8mp: synchronise device tree with linux
imx8mn: synchronise device tree with linux
imx8mm: synchronise device tree with linux

 arch/arm/dts/imx8mm-beacon-baseboard.dtsi     |   4 +-
 arch/arm/dts/imx8mm-evk.dtsi                  |  43 ++
 arch/arm/dts/imx8mm-icore-mx8mm.dtsi          |  12 +-
 arch/arm/dts/imx8mm-mx8menlo.dts              |   4 +-
 arch/arm/dts/imx8mm-u-boot.dtsi               |   2 +-
 arch/arm/dts/imx8mm-venice-gw700x.dtsi        |  24 +-
 arch/arm/dts/imx8mm-venice-gw7901.dts         |   8 +-
 arch/arm/dts/imx8mm-venice-gw7902.dts         |  10 +-
 arch/arm/dts/imx8mm-venice-gw7903.dts         |   6 +-
 arch/arm/dts/imx8mm-verdin.dtsi               |  10 +-
 arch/arm/dts/imx8mn-beacon-baseboard.dtsi     |   4 +-
 arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi    |   2 +-
 .../dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi  |   2 +-
 arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi      |   2 +-
 arch/arm/dts/imx8mn-evk.dtsi                  |  45 +-
 .../dts/imx8mn-var-som-symphony-u-boot.dtsi   |   2 +-
 arch/arm/dts/imx8mn-var-som-symphony.dts      |   6 +-
 arch/arm/dts/imx8mn-venice-gw7902.dts         |   8 +-
 arch/arm/dts/imx8mn-venice-u-boot.dtsi        |   2 +-
 arch/arm/dts/imx8mn.dtsi                      |  13 +-
 arch/arm/dts/imx8mp-dhcom-pdk2.dts            |  27 +-
 arch/arm/dts/imx8mp-dhcom-som.dtsi            |  20 +-
 arch/arm/dts/imx8mp-evk.dts                   | 126 ++--
 arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts   |  48 +-
 arch/arm/dts/imx8mp-u-boot.dtsi               |   2 +-
 arch/arm/dts/imx8mp-venice-gw74xx.dts         | 116 ++--
 arch/arm/dts/imx8mp-verdin.dtsi               |  14 +-
 arch/arm/dts/imx8mp.dtsi                      |  33 +-
 arch/arm/dts/imx8mq-evk.dts                   |  43 ++
 arch/arm/dts/imx8mq-u-boot.dtsi               |  10 +-
 arch/arm/dts/imx8mq.dtsi                      |  15 +-
 arch/arm/dts/imx8ulp-evk-u-boot.dtsi          |  15 +-
 arch/arm/dts/imx8ulp-evk.dts                  | 191 +-----
 arch/arm/dts/imx8ulp-pinfunc.h                |   4 +-
 arch/arm/dts/imx8ulp.dtsi                     | 564 +++++-------------
 arch/arm/dts/imxrt1020-evk-u-boot.dtsi        |   7 +-
 arch/arm/dts/imxrt1020-evk.dts                |   1 -
 arch/arm/dts/imxrt1050-evk-u-boot.dtsi        | 155 ++++-
 arch/arm/dts/imxrt1050-evk.dts                | 257 +-------
 arch/arm/dts/imxrt1050-pinfunc.h              |   2 +-
 arch/arm/dts/imxrt1050.dtsi                   | 168 +++---
 arch/arm/dts/vf610-pinfunc.h                  |   2 +-
 include/dt-bindings/clock/imx8mp-clock.h      |  13 +-
 include/dt-bindings/clock/imx8ulp-clock.h     |  49 +-
 include/dt-bindings/clock/imxrt1050-clock.h   |   9 +-
 include/dt-bindings/interconnect/imx8mm.h     |  50 ++
 include/dt-bindings/interconnect/imx8mn.h     |  41 ++
 include/dt-bindings/power/imx8mp-power.h      |  15 +-
 include/dt-bindings/power/imx8ulp-power.h     |  26 +
 include/dt-bindings/reset/imx8mp-reset.h      |  50 ++
 include/dt-bindings/reset/imx8mq-reset.h      |  61 +-
 include/dt-bindings/reset/imx8ulp-pcc-reset.h |  59 ++
 52 files changed, 1146 insertions(+), 1256 deletions(-)
 create mode 100644 include/dt-bindings/interconnect/imx8mm.h
 create mode 100644 include/dt-bindings/interconnect/imx8mn.h
 create mode 100644 include/dt-bindings/power/imx8ulp-power.h
 create mode 100644 include/dt-bindings/reset/imx8mp-reset.h
 create mode 100644 include/dt-bindings/reset/imx8ulp-pcc-reset.h
Signature · 1 line
2.35.1
#1 lore raw

PATCH v2 1/8 vf610: synchronise device tree with linux

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v6.0-rc1 plus the recent DDR pinmux addition still being in-flight.

---

(no changes since v1)

 arch/arm/dts/vf610-pinfunc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/vf610-pinfunc.h +1 -1
index 740276431aa..b7b7322a2d1 100644
@@ -802,7 +802,6 @@
 #define VF610_PAD_PTE28__EWM_OUT		0x214 0x000 ALT7 0x0
 #define VF610_PAD_PTA7__GPIO_134		0x218 0x000 ALT0 0x0
 #define VF610_PAD_PTA7__VIU_PIX_CLK		0x218 0x3AC ALT1 0x1
-
 #define VF610_PAD_DDR_RESETB			0x21c 0x000 ALT0 0x0
 #define VF610_PAD_DDR_A15__DDR_A_15		0x220 0x000 ALT0 0x0
 #define VF610_PAD_DDR_A14__DDR_A_14		0x224 0x000 ALT0 0x0
@@ -853,4 +852,5 @@
 #define VF610_PAD_DDR_ODT0__DDR_ODT_1		0x2d8 0x000 ALT0 0x0
 #define VF610_PAD_DDR_DDRBYTE1__DDR_DDRBYTE1	0x2dc 0x000 ALT0 0x0
 #define VF610_PAD_DDR_DDRBYTE2__DDR_DDRBYTE2	0x2e0 0x000 ALT0 0x0
+
 #endif
Signature · 1 line
2.35.1
#2 lore raw

PATCH v2 2/8 imxrt1020: fix lpuart issue in common u-boot device tree

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Fix lpuart issue in common U-Boot device tree.

---

(no changes since v1)

 arch/arm/dts/imxrt1020-evk-u-boot.dtsi | 7 ++++---
 arch/arm/dts/imxrt1020-evk.dts         | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/dts/imxrt1020-evk-u-boot.dtsi +4 -3
index 9e1b074d2e7..7cab486f5fa 100644
@@ -67,9 +67,6 @@
 
 	imxrt1020-evk {
 		u-boot,dm-spl;
-		pinctrl_lpuart1: lpuart1grp {
-			u-boot,dm-spl;
-		};
 
 		pinctrl_semc: semcgrp {
 			u-boot,dm-spl;
@@ -81,6 +78,10 @@
 	};
 };
 
+&pinctrl_lpuart1 {
+	u-boot,dm-spl;
+};
+
 &usdhc1 {
 	u-boot,dm-spl;
 };
arch/arm/dts/imxrt1020-evk.dts +0 -1
index 22ae5ed7359..d4d1de4ea84 100644
@@ -6,7 +6,6 @@
 
 /dts-v1/;
 #include "imxrt1020.dtsi"
-#include "imxrt1020-evk-u-boot.dtsi"
 #include "imxrt1020-pinfunc.h"
 
 / {
Signature · 1 line
2.35.1
#3 lore raw

PATCH v2 3/8 imxrt1050: synchronise device tree with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v6.0-rc1.

---

Changes in v2:
- imxrt1050: Re-added DDR timings aka semc node as pointed out by Fabio. Thanks!

 arch/arm/dts/imxrt1050-evk-u-boot.dtsi      | 155 ++++++++++--
 arch/arm/dts/imxrt1050-evk.dts              | 257 +++-----------------
 arch/arm/dts/imxrt1050-pinfunc.h            |   2 +-
 arch/arm/dts/imxrt1050.dtsi                 | 168 ++++++-------
 include/dt-bindings/clock/imxrt1050-clock.h |   9 +-
 5 files changed, 248 insertions(+), 343 deletions(-)
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +139 -16
index 617cece448a..7db53b19c2f 100644
@@ -4,6 +4,8 @@
  * Author(s): Giulio Benetti <[email protected]>
  */
 
+#include <dt-bindings/memory/imxrt-sdram.h>
+
 / {
 	chosen {
 		u-boot,dm-spl;
@@ -15,6 +17,52 @@
 
 	soc {
 		u-boot,dm-spl;
+
+		semc@402f0000 {
+			compatible = "fsl,imxrt-semc";
+			clocks = <&clks IMXRT1050_CLK_SEMC>;
+			pinctrl-0 = <&pinctrl_semc>;
+			pinctrl-names = "default";
+			reg = <0x402f0000 0x4000>;
+			status = "okay";
+			u-boot,dm-spl;
+
+			/*
+			 * Memory configuration from sdram datasheet IS42S16160J-6BLI
+			 */
+			fsl,sdram-mux = /bits/ 8 <MUX_A8_SDRAM_A8
+						  MUX_CSX0_SDRAM_CS1
+						  0
+						  0
+						  0
+						  0>;
+			fsl,sdram-control = /bits/ 8 <MEM_WIDTH_16BITS
+						      BL_8
+						      COL_9BITS
+						      CL_3>;
+			fsl,sdram-timing = /bits/ 8 <0x2
+						     0x2
+						     0x9
+						     0x1
+						     0x5
+						     0x6
+
+						     0x20
+						     0x09
+						     0x01
+						     0x00
+
+						     0x04
+						     0x0A
+						     0x21
+						     0x50>;
+
+			bank1: bank@0 {
+				fsl,base-address = <0x80000000>;
+				fsl,memory-size = <MEM_SIZE_32M>;
+				u-boot,dm-spl;
+			};
+		};
 	};
 };
 
@@ -50,7 +98,7 @@
 	u-boot,dm-spl;
 };
 
-&gpt1 {
+&gpt {
 	u-boot,dm-spl;
 };
 
@@ -58,33 +106,108 @@
 	u-boot,dm-spl;
 };
 
-&semc {
-	u-boot,dm-spl;
-
-	bank1: bank@0 {
-		u-boot,dm-spl;
-	};
-};
-
 &iomuxc {
 	u-boot,dm-spl;
 
 	imxrt1050-evk {
 		u-boot,dm-spl;
-		pinctrl_lpuart1: lpuart1grp {
-			u-boot,dm-spl;
-		};
 
 		pinctrl_semc: semcgrp {
-			u-boot,dm-spl;
-		};
-
-		pinctrl_usdhc0: usdhc0grp {
+			fsl,pins = <
+				MXRT1050_IOMUXC_GPIO_EMC_00_SEMC_DA00
+					0xf1	/* SEMC_D0 */
+				MXRT1050_IOMUXC_GPIO_EMC_01_SEMC_DA01
+					0xf1    /* SEMC_D1 */
+				MXRT1050_IOMUXC_GPIO_EMC_02_SEMC_DA02
+					0xf1    /* SEMC_D2 */
+				MXRT1050_IOMUXC_GPIO_EMC_03_SEMC_DA03
+					0xf1    /* SEMC_D3 */
+				MXRT1050_IOMUXC_GPIO_EMC_04_SEMC_DA04
+					0xf1    /* SEMC_D4 */
+				MXRT1050_IOMUXC_GPIO_EMC_05_SEMC_DA05
+					0xf1    /* SEMC_D5 */
+				MXRT1050_IOMUXC_GPIO_EMC_06_SEMC_DA06
+					0xf1    /* SEMC_D6 */
+				MXRT1050_IOMUXC_GPIO_EMC_07_SEMC_DA07
+					0xf1    /* SEMC_D7 */
+				MXRT1050_IOMUXC_GPIO_EMC_08_SEMC_DM00
+					0xf1    /* SEMC_DM0 */
+				MXRT1050_IOMUXC_GPIO_EMC_09_SEMC_ADDR00
+					0xf1    /* SEMC_A0 */
+				MXRT1050_IOMUXC_GPIO_EMC_10_SEMC_ADDR01
+					0xf1    /* SEMC_A1 */
+				MXRT1050_IOMUXC_GPIO_EMC_11_SEMC_ADDR02
+					0xf1    /* SEMC_A2 */
+				MXRT1050_IOMUXC_GPIO_EMC_12_SEMC_ADDR03
+					0xf1    /* SEMC_A3 */
+				MXRT1050_IOMUXC_GPIO_EMC_13_SEMC_ADDR04
+					0xf1    /* SEMC_A4 */
+				MXRT1050_IOMUXC_GPIO_EMC_14_SEMC_ADDR05
+					0xf1    /* SEMC_A5 */
+				MXRT1050_IOMUXC_GPIO_EMC_15_SEMC_ADDR06
+					0xf1    /* SEMC_A6 */
+				MXRT1050_IOMUXC_GPIO_EMC_16_SEMC_ADDR07
+					0xf1    /* SEMC_A7 */
+				MXRT1050_IOMUXC_GPIO_EMC_17_SEMC_ADDR08
+					0xf1    /* SEMC_A8 */
+				MXRT1050_IOMUXC_GPIO_EMC_18_SEMC_ADDR09
+					0xf1    /* SEMC_A9 */
+				MXRT1050_IOMUXC_GPIO_EMC_19_SEMC_ADDR11
+					0xf1    /* SEMC_A11 */
+				MXRT1050_IOMUXC_GPIO_EMC_20_SEMC_ADDR12
+					0xf1    /* SEMC_A12 */
+				MXRT1050_IOMUXC_GPIO_EMC_21_SEMC_BA0
+					0xf1    /* SEMC_BA0 */
+				MXRT1050_IOMUXC_GPIO_EMC_22_SEMC_BA1
+					0xf1    /* SEMC_BA1 */
+				MXRT1050_IOMUXC_GPIO_EMC_23_SEMC_ADDR10
+					0xf1    /* SEMC_A10 */
+				MXRT1050_IOMUXC_GPIO_EMC_24_SEMC_CAS
+					0xf1    /* SEMC_CAS */
+				MXRT1050_IOMUXC_GPIO_EMC_25_SEMC_RAS
+					0xf1    /* SEMC_RAS */
+				MXRT1050_IOMUXC_GPIO_EMC_26_SEMC_CLK
+					0xf1    /* SEMC_CLK */
+				MXRT1050_IOMUXC_GPIO_EMC_27_SEMC_CKE
+					0xf1    /* SEMC_CKE */
+				MXRT1050_IOMUXC_GPIO_EMC_28_SEMC_WE
+					0xf1    /* SEMC_WE */
+				MXRT1050_IOMUXC_GPIO_EMC_29_SEMC_CS0
+					0xf1    /* SEMC_CS0 */
+				MXRT1050_IOMUXC_GPIO_EMC_30_SEMC_DA08
+					0xf1    /* SEMC_D8 */
+				MXRT1050_IOMUXC_GPIO_EMC_31_SEMC_DA09
+					0xf1    /* SEMC_D9 */
+				MXRT1050_IOMUXC_GPIO_EMC_32_SEMC_DA10
+					0xf1    /* SEMC_D10 */
+				MXRT1050_IOMUXC_GPIO_EMC_33_SEMC_DA11
+					0xf1    /* SEMC_D11 */
+				MXRT1050_IOMUXC_GPIO_EMC_34_SEMC_DA12
+					0xf1    /* SEMC_D12 */
+				MXRT1050_IOMUXC_GPIO_EMC_35_SEMC_DA13
+					0xf1    /* SEMC_D13 */
+				MXRT1050_IOMUXC_GPIO_EMC_36_SEMC_DA14
+					0xf1    /* SEMC_D14 */
+				MXRT1050_IOMUXC_GPIO_EMC_37_SEMC_DA15
+					0xf1    /* SEMC_D15 */
+				MXRT1050_IOMUXC_GPIO_EMC_38_SEMC_DM01
+					0xf1    /* SEMC_DM1 */
+				MXRT1050_IOMUXC_GPIO_EMC_39_SEMC_DQS
+					(IMX_PAD_SION | 0xf1)   /* SEMC_DQS */
+			>;
 			u-boot,dm-spl;
 		};
 	};
 };
 
+&pinctrl_lpuart1 {
+	u-boot,dm-spl;
+};
+
+&pinctrl_usdhc0 {
+	u-boot,dm-spl;
+};
+
 &usdhc1 {
 	u-boot,dm-spl;
 };
arch/arm/dts/imxrt1050-evk.dts +31 -226

294 lines not on this page · raw message

arch/arm/dts/imxrt1050-pinfunc.h +1 -1
index a29031ab3de..22c14a3262a 100644
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
  * Copyright (C) 2019
  * Author(s): Giulio Benetti <[email protected]>
arch/arm/dts/imxrt1050.dtsi +70 -98

248 lines not on this page · raw message

include/dt-bindings/clock/imxrt1050-clock.h +7 -2
index f74dbbcf937..93bef0832d1 100644
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 /*
  * Copyright(C) 2019
  * Author(s): Giulio Benetti <[email protected]>
@@ -62,6 +62,11 @@
 #define IMXRT1050_CLK_PLL7_USB_HOST		53
 #define IMXRT1050_CLK_LCDIF_PIX			54
 #define IMXRT1050_CLK_USBOH3			55
-#define IMXRT1050_CLK_END			56
+#define IMXRT1050_CLK_IPG_PDOF			56
+#define IMXRT1050_CLK_PER_CLK_SEL		57
+#define IMXRT1050_CLK_PER_PDOF			58
+#define IMXRT1050_CLK_DMA			59
+#define IMXRT1050_CLK_DMA_MUX			60
+#define IMXRT1050_CLK_END			61
 
 #endif /* __DT_BINDINGS_CLOCK_IMXRT1050_H */
Signature · 1 line
2.35.1
#4 lore raw

Re: [PATCH v2 3/8] imxrt1050: synchronise device tree with linux

Quoted 23 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v6.0-rc1.

---

Changes in v2:
- imxrt1050: Re-added DDR timings aka semc node as pointed out by Fabio. Thanks!

  arch/arm/dts/imxrt1050-evk-u-boot.dtsi      | 155 ++++++++++--
  arch/arm/dts/imxrt1050-evk.dts              | 257 +++-----------------
  arch/arm/dts/imxrt1050-pinfunc.h            |   2 +-
  arch/arm/dts/imxrt1050.dtsi                 | 168 ++++++-------
  include/dt-bindings/clock/imxrt1050-clock.h |   9 +-
  5 files changed, 248 insertions(+), 343 deletions(-)
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +0 -0
index 617cece448a..7db53b19c2f 100644

arch/arm/dts/imxrt1050-evk-u-boot.dtsi line 8

Quoted 5 lines
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +2 -0
@@ -4,6 +4,8 @@
   * Author(s): Giulio Benetti <[email protected]>
   */
 
+#include <dt-bindings/memory/imxrt-sdram.h>
+

#include "imxrt1050-pinfunc.h"

arch/arm/dts/imxrt1050-evk-u-boot.dtsi line 11

Quoted 3 lines
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +0 -0
  / {
  	chosen {
  		u-boot,dm-spl;

diff says tick-timer = &gpt; its important for boot

arch/arm/dts/imxrt1050-evk-u-boot.dtsi line 28

Quoted 13 lines
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +9 -0
@@ -15,6 +17,52 @@
 
  	soc {
  		u-boot,dm-spl;
+
+		semc@402f0000 {
+			compatible = "fsl,imxrt-semc";
+			clocks = <&clks IMXRT1050_CLK_SEMC>;
+			pinctrl-0 = <&pinctrl_semc>;
+			pinctrl-names = "default";
+			reg = <0x402f0000 0x4000>;
+			status = "okay";
+			u-boot,dm-spl;

I dont think this part under should go here tell me if im wrong. It should be move outside as a reference.

Quoted 40 lines
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +36 -0
+			/*
+			 * Memory configuration from sdram datasheet IS42S16160J-6BLI
+			 */
+			fsl,sdram-mux = /bits/ 8 <MUX_A8_SDRAM_A8
+						  MUX_CSX0_SDRAM_CS1
+						  0
+						  0
+						  0
+						  0>;
+			fsl,sdram-control = /bits/ 8 <MEM_WIDTH_16BITS
+						      BL_8
+						      COL_9BITS
+						      CL_3>;
+			fsl,sdram-timing = /bits/ 8 <0x2
+						     0x2
+						     0x9
+						     0x1
+						     0x5
+						     0x6
+
+						     0x20
+						     0x09
+						     0x01
+						     0x00
+
+						     0x04
+						     0x0A
+						     0x21
+						     0x50>;
+
+			bank1: bank@0 {
+				fsl,base-address = <0x80000000>;
+				fsl,memory-size = <MEM_SIZE_32M>;
+				u-boot,dm-spl;
+			};
+		};
  	};
  };
 

arch/arm/dts/imxrt1050-evk-u-boot.dtsi line 101

Quoted 5 lines
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +1 -1
@@ -50,7 +98,7 @@
  	u-boot,dm-spl;
  };
 
-&gpt1 {
+&gpt {

Add diff:

	clocks = <&osc>;
	compatible = "fsl,imxrt-gpt";
	status = "okay";
Quoted 107 lines
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +78 -15
  	u-boot,dm-spl;
  };
 
@@ -58,33 +106,108 @@
  	u-boot,dm-spl;
  };
 
-&semc {
-	u-boot,dm-spl;
-
-	bank1: bank@0 {
-		u-boot,dm-spl;
-	};
-};
-
  &iomuxc {
  	u-boot,dm-spl;
 
  	imxrt1050-evk {drop unneeded node ^^^
  		u-boot,dm-spl;
-		pinctrl_lpuart1: lpuart1grp {
-			u-boot,dm-spl;
-		};
 
  		pinctrl_semc: semcgrp {
-			u-boot,dm-spl;
-		};
-
-		pinctrl_usdhc0: usdhc0grp {
+			fsl,pins = <
+				MXRT1050_IOMUXC_GPIO_EMC_00_SEMC_DA00
+					0xf1	/* SEMC_D0 */
+				MXRT1050_IOMUXC_GPIO_EMC_01_SEMC_DA01
+					0xf1    /* SEMC_D1 */
+				MXRT1050_IOMUXC_GPIO_EMC_02_SEMC_DA02
+					0xf1    /* SEMC_D2 */
+				MXRT1050_IOMUXC_GPIO_EMC_03_SEMC_DA03
+					0xf1    /* SEMC_D3 */
+				MXRT1050_IOMUXC_GPIO_EMC_04_SEMC_DA04
+					0xf1    /* SEMC_D4 */
+				MXRT1050_IOMUXC_GPIO_EMC_05_SEMC_DA05
+					0xf1    /* SEMC_D5 */
+				MXRT1050_IOMUXC_GPIO_EMC_06_SEMC_DA06
+					0xf1    /* SEMC_D6 */
+				MXRT1050_IOMUXC_GPIO_EMC_07_SEMC_DA07
+					0xf1    /* SEMC_D7 */
+				MXRT1050_IOMUXC_GPIO_EMC_08_SEMC_DM00
+					0xf1    /* SEMC_DM0 */
+				MXRT1050_IOMUXC_GPIO_EMC_09_SEMC_ADDR00
+					0xf1    /* SEMC_A0 */
+				MXRT1050_IOMUXC_GPIO_EMC_10_SEMC_ADDR01
+					0xf1    /* SEMC_A1 */
+				MXRT1050_IOMUXC_GPIO_EMC_11_SEMC_ADDR02
+					0xf1    /* SEMC_A2 */
+				MXRT1050_IOMUXC_GPIO_EMC_12_SEMC_ADDR03
+					0xf1    /* SEMC_A3 */
+				MXRT1050_IOMUXC_GPIO_EMC_13_SEMC_ADDR04
+					0xf1    /* SEMC_A4 */
+				MXRT1050_IOMUXC_GPIO_EMC_14_SEMC_ADDR05
+					0xf1    /* SEMC_A5 */
+				MXRT1050_IOMUXC_GPIO_EMC_15_SEMC_ADDR06
+					0xf1    /* SEMC_A6 */
+				MXRT1050_IOMUXC_GPIO_EMC_16_SEMC_ADDR07
+					0xf1    /* SEMC_A7 */
+				MXRT1050_IOMUXC_GPIO_EMC_17_SEMC_ADDR08
+					0xf1    /* SEMC_A8 */
+				MXRT1050_IOMUXC_GPIO_EMC_18_SEMC_ADDR09
+					0xf1    /* SEMC_A9 */
+				MXRT1050_IOMUXC_GPIO_EMC_19_SEMC_ADDR11
+					0xf1    /* SEMC_A11 */
+				MXRT1050_IOMUXC_GPIO_EMC_20_SEMC_ADDR12
+					0xf1    /* SEMC_A12 */
+				MXRT1050_IOMUXC_GPIO_EMC_21_SEMC_BA0
+					0xf1    /* SEMC_BA0 */
+				MXRT1050_IOMUXC_GPIO_EMC_22_SEMC_BA1
+					0xf1    /* SEMC_BA1 */
+				MXRT1050_IOMUXC_GPIO_EMC_23_SEMC_ADDR10
+					0xf1    /* SEMC_A10 */
+				MXRT1050_IOMUXC_GPIO_EMC_24_SEMC_CAS
+					0xf1    /* SEMC_CAS */
+				MXRT1050_IOMUXC_GPIO_EMC_25_SEMC_RAS
+					0xf1    /* SEMC_RAS */
+				MXRT1050_IOMUXC_GPIO_EMC_26_SEMC_CLK
+					0xf1    /* SEMC_CLK */
+				MXRT1050_IOMUXC_GPIO_EMC_27_SEMC_CKE
+					0xf1    /* SEMC_CKE */
+				MXRT1050_IOMUXC_GPIO_EMC_28_SEMC_WE
+					0xf1    /* SEMC_WE */
+				MXRT1050_IOMUXC_GPIO_EMC_29_SEMC_CS0
+					0xf1    /* SEMC_CS0 */
+				MXRT1050_IOMUXC_GPIO_EMC_30_SEMC_DA08
+					0xf1    /* SEMC_D8 */
+				MXRT1050_IOMUXC_GPIO_EMC_31_SEMC_DA09
+					0xf1    /* SEMC_D9 */
+				MXRT1050_IOMUXC_GPIO_EMC_32_SEMC_DA10
+					0xf1    /* SEMC_D10 */
+				MXRT1050_IOMUXC_GPIO_EMC_33_SEMC_DA11
+					0xf1    /* SEMC_D11 */
+				MXRT1050_IOMUXC_GPIO_EMC_34_SEMC_DA12
+					0xf1    /* SEMC_D12 */
+				MXRT1050_IOMUXC_GPIO_EMC_35_SEMC_DA13
+					0xf1    /* SEMC_D13 */
+				MXRT1050_IOMUXC_GPIO_EMC_36_SEMC_DA14
+					0xf1    /* SEMC_D14 */
+				MXRT1050_IOMUXC_GPIO_EMC_37_SEMC_DA15
+					0xf1    /* SEMC_D15 */
+				MXRT1050_IOMUXC_GPIO_EMC_38_SEMC_DM01

arch/arm/dts/imxrt1050-evk-u-boot.dtsi line 203

Quoted 10 lines
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +5 -0
+					0xf1    /* SEMC_DM1 */
+				MXRT1050_IOMUXC_GPIO_EMC_39_SEMC_DQS
+					(IMX_PAD_SION | 0xf1)   /* SEMC_DQS */
+			>;
  			u-boot,dm-spl;
  		};
  	};
  };
 
+&pinctrl_lpuart1 {

Add diff:

	compatible = "fsl,imxrt-lpuart";

arch/arm/dts/imxrt1050-evk-u-boot.dtsi line 207

Quoted 4 lines
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +4 -0
+	u-boot,dm-spl;
+};
+
+&pinctrl_usdhc0 {

Add diff:

	compatible = "fsl,imxrt-usdhc";

I tested this https://github.com/Mr-Bossman/u-boot/commit/42a7f430d761bb4d44f646a27649deda15352f2e
Some note for future, check if the compatibles are the same they arent here so the soc.dtsi will be broken. Also wait a bit for other people to resopnd to patches before sending out v2 because no one commented on the other patches yet.

Thanks,
Jesse

Quoted 600 lines
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +3 -0
+	u-boot,dm-spl;
+};
+
  &usdhc1 {
  	u-boot,dm-spl;
  };
arch/arm/dts/imxrt1050-evk.dts +31 -226
index fb2da3adfcf..6a9c10decf5 100644
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  /*
   * Copyright (C) 2019
   * Author(s): Giulio Benetti <[email protected]>
@@ -6,7 +6,6 @@
 
  /dts-v1/;
  #include "imxrt1050.dtsi"
-#include "imxrt1050-evk-u-boot.dtsi"
  #include "imxrt1050-pinfunc.h"
 
  / {
@@ -14,210 +13,52 @@
  	compatible = "fsl,imxrt1050-evk", "fsl,imxrt1050";
 
  	chosen {
-		bootargs = "root=/dev/ram";
-		stdout-path = "serial0:115200n8";
-		tick-timer = &gpt1;
+		stdout-path = &lpuart1;
  	};
 
-	memory {
+	aliases {
+		gpio0 = &gpio1;
+		gpio1 = &gpio2;
+		gpio2 = &gpio3;
+		gpio3 = &gpio4;
+		gpio4 = &gpio5;
+		mmc0 = &usdhc1;
+		serial0 = &lpuart1;
+	};
+
+	memory@80000000 {
  		device_type = "memory";
  		reg = <0x80000000 0x2000000>;
  	};
  };
 
-&lpuart1 { /* console */
+&lpuart1 {
  	pinctrl-names = "default";
  	pinctrl-0 = <&pinctrl_lpuart1>;
  	status = "okay";
  };
 
-&semc {
-	/*
-	 * Memory configuration from sdram datasheet IS42S16160J-6BLI
-	 */
-	fsl,sdram-mux = /bits/ 8 <MUX_A8_SDRAM_A8
-				MUX_CSX0_SDRAM_CS1
-				0
-				0
-				0
-				0>;
-	fsl,sdram-control = /bits/ 8 <MEM_WIDTH_16BITS
-					BL_8
-					COL_9BITS
-					CL_3>;
-	fsl,sdram-timing = /bits/ 8 <0x2
-				     0x2
-				     0x9
-				     0x1
-				     0x5
-				     0x6
-
-				     0x20
-				     0x09
-				     0x01
-				     0x00
-
-				     0x04
-				     0x0A
-				     0x21
-				     0x50>;
-
-	bank1: bank@0 {
-		fsl,base-address = <0x80000000>;
-		fsl,memory-size = <MEM_SIZE_32M>;
-	};
-};
-
  &iomuxc {
  	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_lpuart1>;
-
-	imxrt1050-evk {
-		pinctrl_lpuart1: lpuart1grp {
-			fsl,pins = <
-				MXRT1050_IOMUXC_GPIO_AD_B0_12_LPUART1_TXD
-					0xf1
-				MXRT1050_IOMUXC_GPIO_AD_B0_13_LPUART1_RXD
-					0xf1
-			>;
-		};
-
-		pinctrl_semc: semcgrp {
-			fsl,pins = <
-				MXRT1050_IOMUXC_GPIO_EMC_00_SEMC_DA00
-					0xf1	/* SEMC_D0 */
-				MXRT1050_IOMUXC_GPIO_EMC_01_SEMC_DA01
-					0xf1	/* SEMC_D1 */
-				MXRT1050_IOMUXC_GPIO_EMC_02_SEMC_DA02
-					0xf1	/* SEMC_D2 */
-				MXRT1050_IOMUXC_GPIO_EMC_03_SEMC_DA03
-					0xf1	/* SEMC_D3 */
-				MXRT1050_IOMUXC_GPIO_EMC_04_SEMC_DA04
-					0xf1	/* SEMC_D4 */
-				MXRT1050_IOMUXC_GPIO_EMC_05_SEMC_DA05
-					0xf1	/* SEMC_D5 */
-				MXRT1050_IOMUXC_GPIO_EMC_06_SEMC_DA06
-					0xf1	/* SEMC_D6 */
-				MXRT1050_IOMUXC_GPIO_EMC_07_SEMC_DA07
-					0xf1	/* SEMC_D7 */
-				MXRT1050_IOMUXC_GPIO_EMC_08_SEMC_DM00
-					0xf1	/* SEMC_DM0 */
-				MXRT1050_IOMUXC_GPIO_EMC_09_SEMC_ADDR00
-					0xf1	/* SEMC_A0 */
-				MXRT1050_IOMUXC_GPIO_EMC_10_SEMC_ADDR01
-					0xf1	/* SEMC_A1 */
-				MXRT1050_IOMUXC_GPIO_EMC_11_SEMC_ADDR02
-					0xf1	/* SEMC_A2 */
-				MXRT1050_IOMUXC_GPIO_EMC_12_SEMC_ADDR03
-					0xf1	/* SEMC_A3 */
-				MXRT1050_IOMUXC_GPIO_EMC_13_SEMC_ADDR04
-					0xf1	/* SEMC_A4 */
-				MXRT1050_IOMUXC_GPIO_EMC_14_SEMC_ADDR05
-					0xf1	/* SEMC_A5 */
-				MXRT1050_IOMUXC_GPIO_EMC_15_SEMC_ADDR06
-					0xf1	/* SEMC_A6 */
-				MXRT1050_IOMUXC_GPIO_EMC_16_SEMC_ADDR07
-					0xf1	/* SEMC_A7 */
-				MXRT1050_IOMUXC_GPIO_EMC_17_SEMC_ADDR08
-					0xf1	/* SEMC_A8 */
-				MXRT1050_IOMUXC_GPIO_EMC_18_SEMC_ADDR09
-					0xf1	/* SEMC_A9 */
-				MXRT1050_IOMUXC_GPIO_EMC_19_SEMC_ADDR11
-					0xf1	/* SEMC_A11 */
-				MXRT1050_IOMUXC_GPIO_EMC_20_SEMC_ADDR12
-					0xf1	/* SEMC_A12 */
-				MXRT1050_IOMUXC_GPIO_EMC_21_SEMC_BA0
-					0xf1	/* SEMC_BA0 */
-				MXRT1050_IOMUXC_GPIO_EMC_22_SEMC_BA1
-					0xf1	/* SEMC_BA1 */
-				MXRT1050_IOMUXC_GPIO_EMC_23_SEMC_ADDR10
-					0xf1	/* SEMC_A10 */
-				MXRT1050_IOMUXC_GPIO_EMC_24_SEMC_CAS
-					0xf1	/* SEMC_CAS */
-				MXRT1050_IOMUXC_GPIO_EMC_25_SEMC_RAS
-					0xf1	/* SEMC_RAS */
-				MXRT1050_IOMUXC_GPIO_EMC_26_SEMC_CLK
-					0xf1	/* SEMC_CLK */
-				MXRT1050_IOMUXC_GPIO_EMC_27_SEMC_CKE
-					0xf1	/* SEMC_CKE */
-				MXRT1050_IOMUXC_GPIO_EMC_28_SEMC_WE
-					0xf1	/* SEMC_WE */
-				MXRT1050_IOMUXC_GPIO_EMC_29_SEMC_CS0
-					0xf1	/* SEMC_CS0 */
-				MXRT1050_IOMUXC_GPIO_EMC_30_SEMC_DA08
-					0xf1	/* SEMC_D8 */
-				MXRT1050_IOMUXC_GPIO_EMC_31_SEMC_DA09
-					0xf1	/* SEMC_D9 */
-				MXRT1050_IOMUXC_GPIO_EMC_32_SEMC_DA10
-					0xf1	/* SEMC_D10 */
-				MXRT1050_IOMUXC_GPIO_EMC_33_SEMC_DA11
-					0xf1	/* SEMC_D11 */
-				MXRT1050_IOMUXC_GPIO_EMC_34_SEMC_DA12
-					0xf1	/* SEMC_D12 */
-				MXRT1050_IOMUXC_GPIO_EMC_35_SEMC_DA13
-					0xf1	/* SEMC_D13 */
-				MXRT1050_IOMUXC_GPIO_EMC_36_SEMC_DA14
-					0xf1	/* SEMC_D14 */
-				MXRT1050_IOMUXC_GPIO_EMC_37_SEMC_DA15
-					0xf1	/* SEMC_D15 */
-				MXRT1050_IOMUXC_GPIO_EMC_38_SEMC_DM01
-					0xf1	/* SEMC_DM1 */
-				MXRT1050_IOMUXC_GPIO_EMC_39_SEMC_DQS
-					(IMX_PAD_SION | 0xf1)	/* SEMC_DQS */
-			>;
-		};
-
-		pinctrl_usdhc0: usdhc0grp {
-			fsl,pins = <
-				MXRT1050_IOMUXC_GPIO_B1_12_USDHC1_CD_B
-					0x1B000
-				MXRT1050_IOMUXC_GPIO_B1_14_USDHC1_VSELECT
-					0xB069
-				MXRT1050_IOMUXC_GPIO_SD_B0_00_USDHC1_CMD
-					0x17061
-				MXRT1050_IOMUXC_GPIO_SD_B0_01_USDHC1_CLK
-					0x17061
-				MXRT1050_IOMUXC_GPIO_SD_B0_05_USDHC1_DATA3
-					0x17061
-				MXRT1050_IOMUXC_GPIO_SD_B0_04_USDHC1_DATA2
-					0x17061
-				MXRT1050_IOMUXC_GPIO_SD_B0_03_USDHC1_DATA1
-					0x17061
-				MXRT1050_IOMUXC_GPIO_SD_B0_02_USDHC1_DATA0
-					0x17061
-			>;
-		};
-
-		pinctrl_lcdif: lcdifgrp {
-			fsl,pins = <
-				MXRT1050_IOMUXC_GPIO_B0_00_LCD_CLK		0x1b0b1
-				MXRT1050_IOMUXC_GPIO_B0_01_LCD_ENABLE		0x1b0b1
-				MXRT1050_IOMUXC_GPIO_B0_02_LCD_HSYNC		0x1b0b1
-				MXRT1050_IOMUXC_GPIO_B0_03_LCD_VSYNC		0x1b0b1
-				MXRT1050_IOMUXC_GPIO_B0_04_LCD_DATA00		0x1b0b1
-				MXRT1050_IOMUXC_GPIO_B0_05_LCD_DATA01		0x1b0b1
-				MXRT1050_IOMUXC_GPIO_B0_06_LCD_DATA02		0x1b0b1
-				MXRT1050_IOMUXC_GPIO_B0_07_LCD_DATA03		0x1b0b1
-				MXRT1050_IOMUXC_GPIO_B0_08_LCD_DATA04		0x1b0b1
-				MXRT1050_IOMUXC_GPIO_B0_09_LCD_DATA05		0x1b0b1
-				MXRT1050_IOMUXC_GPIO_B0_10_LCD_DATA06		0x1b0b1
-				MXRT1050_IOMUXC_GPIO_B0_11_LCD_DATA07		0x1b0b1
-				MXRT1050_IOMUXC_GPIO_B0_12_LCD_DATA08		0x1b0b1
-				MXRT1050_IOMUXC_GPIO_B0_13_LCD_DATA09		0x1b0b1
-				MXRT1050_IOMUXC_GPIO_B0_14_LCD_DATA10		0x1b0b1
-				MXRT1050_IOMUXC_GPIO_B0_15_LCD_DATA11		0x1b0b1
-				MXRT1050_IOMUXC_GPIO_B1_01_LCD_DATA13		0x1b0b1
-				MXRT1050_IOMUXC_GPIO_B1_02_LCD_DATA14		0x1b0b1
-				MXRT1050_IOMUXC_GPIO_B1_03_LCD_DATA15		0x1b0b1
-				MXRT1050_IOMUXC_GPIO_B1_15_GPIO2_IO31		0x0b069
-				MXRT1050_IOMUXC_GPIO_AD_B0_02_GPIO1_IO02	0x0b069
-			>;
-		};
+	pinctrl_lpuart1: lpuart1grp {
+		fsl,pins = <
+			MXRT1050_IOMUXC_GPIO_AD_B0_12_LPUART1_TXD	0xf1
+			MXRT1050_IOMUXC_GPIO_AD_B0_13_LPUART1_RXD	0xf1
+		>;
  	};
-};
 
-&gpt1 {
-	status = "okay";
+	pinctrl_usdhc0: usdhc0grp {
+		fsl,pins = <
+			MXRT1050_IOMUXC_GPIO_B1_12_USDHC1_CD_B		0x1B000
+			MXRT1050_IOMUXC_GPIO_B1_14_USDHC1_VSELECT	0xB069
+			MXRT1050_IOMUXC_GPIO_SD_B0_00_USDHC1_CMD	0x17061
+			MXRT1050_IOMUXC_GPIO_SD_B0_01_USDHC1_CLK	0x17061
+			MXRT1050_IOMUXC_GPIO_SD_B0_05_USDHC1_DATA3	0x17061
+			MXRT1050_IOMUXC_GPIO_SD_B0_04_USDHC1_DATA2	0x17061
+			MXRT1050_IOMUXC_GPIO_SD_B0_03_USDHC1_DATA1	0x17061
+			MXRT1050_IOMUXC_GPIO_SD_B0_02_USDHC1_DATA0	0x17061
+		>;
+	};
  };
 
  &usdhc1 {
@@ -226,42 +67,6 @@
  	pinctrl-1 = <&pinctrl_usdhc0>;
  	pinctrl-2 = <&pinctrl_usdhc0>;
  	pinctrl-3 = <&pinctrl_usdhc0>;
-	status = "okay";
-
  	cd-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;
-};
-
-&lcdif {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_lcdif>;
-	display = <&display0>;
-	status = "okay";
-
-	display0: display0 {
-		bits-per-pixel = <16>;
-		bus-width = <16>;
-
-		display-timings {
-			timing0: timing0 {
-				clock-frequency = <9300000>;
-				hactive = <480>;
-				vactive = <272>;
-				hback-porch = <4>;
-				hfront-porch = <8>;
-				vback-porch = <4>;
-				vfront-porch = <8>;
-				hsync-len = <41>;
-				vsync-len = <10>;
-				de-active = <1>;
-				pixelclk-active = <0>;
-				hsync-active = <0>;
-				vsync-active = <0>;
-			};
-		};
-	};
-};
-
-&usbotg1 {
-	dr_mode = "host";
  	status = "okay";
  };
arch/arm/dts/imxrt1050-pinfunc.h +1 -1
index a29031ab3de..22c14a3262a 100644
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
  /*
   * Copyright (C) 2019
   * Author(s): Giulio Benetti <[email protected]>
arch/arm/dts/imxrt1050.dtsi +70 -98
index 09f4712af68..03e6a858a7b 100644
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  /*
   * Copyright (C) 2019
   * Author(s): Giulio Benetti <[email protected]>
@@ -8,53 +8,37 @@
  #include <dt-bindings/interrupt-controller/arm-gic.h>
  #include <dt-bindings/clock/imxrt1050-clock.h>
  #include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/memory/imxrt-sdram.h>
 
  / {
  	#address-cells = <1>;
  	#size-cells = <1>;
 
-	aliases {
-		display0 = &lcdif;
-		gpio0 = &gpio1;
-		gpio1 = &gpio2;
-		gpio2 = &gpio3;
-		gpio3 = &gpio4;
-		gpio4 = &gpio5;
-		mmc0 = &usdhc1;
-		serial0 = &lpuart1;
-		usbphy0 = &usbphy1;
-	};
-
  	clocks {
  		osc: osc {
-			compatible = "fsl,imx-osc", "fixed-clock";
+			compatible = "fixed-clock";
  			#clock-cells = <0>;
  			clock-frequency = <24000000>;
  		};
-	};
 
-	soc {
-		semc: semc@402f0000 {
-			compatible = "fsl,imxrt-semc";
-			reg = <0x402f0000 0x4000>;
-			clocks = <&clks IMXRT1050_CLK_SEMC>;
-			pinctrl-0 = <&pinctrl_semc>;
-			pinctrl-names = "default";
-			status = "okay";
+		osc3M: osc3M {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <3000000>;
  		};
+	};
 
+	soc {
  		lpuart1: serial@40184000 {
-			compatible = "fsl,imxrt-lpuart";
+			compatible = "fsl,imxrt1050-lpuart", "fsl,imx7ulp-lpuart";
  			reg = <0x40184000 0x4000>;
-			interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
+			interrupts = <20>;
  			clocks = <&clks IMXRT1050_CLK_LPUART1>;
-			clock-names = "per";
+			clock-names = "ipg";
  			status = "disabled";
  		};
 
-		iomuxc: iomuxc@401f8000 {
-			compatible = "fsl,imxrt-iomuxc";
+		iomuxc: pinctrl@401f8000 {
+			compatible = "fsl,imxrt1050-iomuxc";
  			reg = <0x401f8000 0x4000>;
  			fsl,mux_mask = <0x7>;
  		};
@@ -64,31 +48,61 @@
  			reg = <0x400d8000 0x4000>;
  		};
 
-		clks: ccm@400fc000 {
+		clks: clock-controller@400fc000 {
  			compatible = "fsl,imxrt1050-ccm";
  			reg = <0x400fc000 0x4000>;
-			interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
+			interrupts = <95>, <96>;
+			clocks = <&osc>;
+			clock-names = "osc";
  			#clock-cells = <1>;
-		};
-
-		usdhc1: usdhc@402c0000 {
-			compatible = "fsl,imxrt-usdhc";
-			reg = <0x402c0000 0x10000>;
-			interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&clks IMXRT1050_CLK_USDHC1>;
-			clock-names = "per";
+			assigned-clocks = <&clks IMXRT1050_CLK_PLL1_BYPASS>,
+				<&clks IMXRT1050_CLK_PLL1_BYPASS>,
+				<&clks IMXRT1050_CLK_PLL2_BYPASS>,
+				<&clks IMXRT1050_CLK_PLL3_BYPASS>,
+				<&clks IMXRT1050_CLK_PLL3_PFD1_664_62M>,
+				<&clks IMXRT1050_CLK_PLL2_PFD2_396M>;
+			assigned-clock-parents = <&clks IMXRT1050_CLK_PLL1_REF_SEL>,
+				<&clks IMXRT1050_CLK_PLL1_ARM>,
+				<&clks IMXRT1050_CLK_PLL2_SYS>,
+				<&clks IMXRT1050_CLK_PLL3_USB_OTG>,
+				<&clks IMXRT1050_CLK_PLL3_USB_OTG>,
+				<&clks IMXRT1050_CLK_PLL2_SYS>;
+		};
+
+		edma1: dma-controller@400e8000 {
+			#dma-cells = <2>;
+			compatible = "fsl,imx7ulp-edma";
+			reg = <0x400e8000 0x4000>,
+				<0x400ec000 0x4000>;
+			dma-channels = <32>;
+			interrupts = <0>, <1>, <2>, <3>, <4>, <5>, <6>, <7>, <8>,
+				<9>, <10>, <11>, <12>, <13>, <14>, <15>, <16>;
+			clock-names = "dma", "dmamux0";
+			clocks = <&clks IMXRT1050_CLK_DMA>,
+				 <&clks IMXRT1050_CLK_DMA_MUX>;
+		};
+
+		usdhc1: mmc@402c0000 {
+			compatible = "fsl,imxrt1050-usdhc", "fsl,imx6sl-usdhc";
+			reg = <0x402c0000 0x4000>;
+			interrupts = <110>;
+			clocks = <&clks IMXRT1050_CLK_IPG_PDOF>,
+				<&clks IMXRT1050_CLK_OSC>,
+				<&clks IMXRT1050_CLK_USDHC1>;
+			clock-names = "ipg", "ahb", "per";
  			bus-width = <4>;
+			fsl,wp-controller;
+			no-1-8-v;
+			max-frequency = <4000000>;
  			fsl,tuning-start-tap = <20>;
-			fsl,tuning-step= <2>;
+			fsl,tuning-step = <2>;
  			status = "disabled";
  		};
 
  		gpio1: gpio@401b8000 {
-			compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio";
+			compatible = "fsl,imxrt1050-gpio", "fsl,imx35-gpio";
  			reg = <0x401b8000 0x4000>;
-			interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
+			interrupts = <80>, <81>;
  			gpio-controller;
  			#gpio-cells = <2>;
  			interrupt-controller;
@@ -96,10 +110,9 @@
  		};
 
  		gpio2: gpio@401bc000 {
-			compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio";
+			compatible = "fsl,imxrt1050-gpio", "fsl,imx35-gpio";
  			reg = <0x401bc000 0x4000>;
-			interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>,
-				<GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
+			interrupts = <82>, <83>;
  			gpio-controller;
  			#gpio-cells = <2>;
  			interrupt-controller;
@@ -107,10 +120,9 @@
  		};
 
  		gpio3: gpio@401c0000 {
-			compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio";
+			compatible = "fsl,imxrt1050-gpio", "fsl,imx35-gpio";
  			reg = <0x401c0000 0x4000>;
-			interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>,
-				<GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
+			interrupts = <84>, <85>;
  			gpio-controller;
  			#gpio-cells = <2>;
  			interrupt-controller;
@@ -118,10 +130,9 @@
  		};
 
  		gpio4: gpio@401c4000 {
-			compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio";
+			compatible = "fsl,imxrt1050-gpio", "fsl,imx35-gpio";
  			reg = <0x401c4000 0x4000>;
-			interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>,
-					<GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
+			interrupts = <86>, <87>;
  			gpio-controller;
  			#gpio-cells = <2>;
  			interrupt-controller;
@@ -129,60 +140,21 @@
  		};
 
  		gpio5: gpio@400c0000 {
-			compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio";
+			compatible = "fsl,imxrt1050-gpio", "fsl,imx35-gpio";
  			reg = <0x400c0000 0x4000>;
-			interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>,
-				<GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
+			interrupts = <88>, <89>;
  			gpio-controller;
  			#gpio-cells = <2>;
  			interrupt-controller;
  			#interrupt-cells = <2>;
  		};
 
-		lcdif: lcdif@402b8000 {
-			compatible = "fsl,imxrt-lcdif";
-			reg = <0x402b8000 0x4000>;
-			interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&clks IMXRT1050_CLK_LCDIF_PIX>,
-				 <&clks IMXRT1050_CLK_LCDIF_APB>;
-			clock-names = "pix", "axi";
-			assigned-clocks = <&clks IMXRT1050_CLK_LCDIF_SEL>;
-			assigned-clock-parents = <&clks IMXRT1050_CLK_PLL5_VIDEO>;
-			status = "disabled";
-		};
-
-		gpt1: gpt1@401ec000 {
-			compatible = "fsl,imxrt-gpt";
+		gpt: timer@401ec000 {
+			compatible = "fsl,imxrt1050-gpt", "fsl,imx6dl-gpt", "fsl,imx6sl-gpt";
  			reg = <0x401ec000 0x4000>;
  			interrupts = <100>;
-			clocks = <&osc>;
-			status = "disabled";
-		};
-
-		usbphy1: usbphy@400d9000 {
-			compatible = "fsl,imxrt-usbphy";
-			reg = <0x400d9000 0x1000>;
-			interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
-		};
-
-		usbmisc: usbmisc@402e0800 {
-			#index-cells = <1>;
-			compatible = "fsl,imxrt-usbmisc";
-			reg = <0x402e0800 0x200>;
-			clocks = <&clks IMXRT1050_CLK_USBOH3>;
-		};
-
-		usbotg1: usb@402e0000 {
-			compatible = "fsl,imxrt-usb", "fsl,imx27-usb";
-			reg = <0x402e0000 0x200>;
-			interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&clks IMXRT1050_CLK_USBOH3>;
-			fsl,usbphy = <&usbphy1>;
-			fsl,usbmisc = <&usbmisc 0>;
-			ahb-burst-config = <0x0>;
-			tx-burst-size-dword = <0x10>;
-			rx-burst-size-dword = <0x10>;
-			status = "disabled";
+			clocks = <&osc3M>;
+			clock-names = "per";
  		};
  	};
  };
include/dt-bindings/clock/imxrt1050-clock.h +7 -2
index f74dbbcf937..93bef0832d1 100644
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
  /*
   * Copyright(C) 2019
   * Author(s): Giulio Benetti <[email protected]>
@@ -62,6 +62,11 @@
  #define IMXRT1050_CLK_PLL7_USB_HOST		53
  #define IMXRT1050_CLK_LCDIF_PIX			54
  #define IMXRT1050_CLK_USBOH3			55
-#define IMXRT1050_CLK_END			56
+#define IMXRT1050_CLK_IPG_PDOF			56
+#define IMXRT1050_CLK_PER_CLK_SEL		57
+#define IMXRT1050_CLK_PER_PDOF			58
+#define IMXRT1050_CLK_DMA			59
+#define IMXRT1050_CLK_DMA_MUX			60
+#define IMXRT1050_CLK_END			61
 
  #endif /* __DT_BINDINGS_CLOCK_IMXRT1050_H */
#5 lore raw

Re: [PATCH v2 3/8] imxrt1050: synchronise device tree with linux

Hi Jesse

Sorry, I kinda missed your reply and imx maintainership was quiet for quite some time. I am now preparing a v3 taking your feedback into account. Thanks!

Quoted 21 lines · Jesse Taube
Quoted 18 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v6.0-rc1.

---

Changes in v2:
- imxrt1050: Re-added DDR timings aka semc node as pointed out by Fabio. Thanks!

  arch/arm/dts/imxrt1050-evk-u-boot.dtsi      | 155 ++++++++++-- arch/arm/dts/imxrt1050-evk.dts              | 257 +++----------------- arch/arm/dts/imxrt1050-pinfunc.h            |   2 +- arch/arm/dts/imxrt1050.dtsi                 | 168 ++++++------- include/dt-bindings/clock/imxrt1050-clock.h |   9 +-

  5 files changed, 248 insertions(+), 343 deletions(-)
Quoted 11 lines

arch/arm/dts/imxrt1050-evk-u-boot.dtsi line 8

Quoted 10 lines
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +0 -0
index 617cece448a..7db53b19c2f 100644
@@ -4,6 +4,8 @@
    * Author(s): Giulio Benetti <[email protected]>
    */

arch/arm/dts/imxrt1050-evk-u-boot.dtsi +2 -0
+#include <dt-bindings/memory/imxrt-sdram.h>
+

#include "imxrt1050-pinfunc.h"

Okay.

Quoted 4 lines
Quoted 3 lines

  / {
        chosen {
                u-boot,dm-spl;

diff says tick-timer = &gpt; its important for boot

Okay.

Quoted 7 lines
Quoted 7 lines
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +0 -0
@@ -15,6 +17,52 @@


        soc {
                u-boot,dm-spl;
+
+               semc@402f0000 {
+                       compatible = "fsl,imxrt-semc";

Quoted 8 lines
Quoted 6 lines

+                       clocks = <&clks IMXRT1050_CLK_SEMC>; +                       pinctrl-0 = <&pinctrl_semc>; +                       pinctrl-names = "default"; +                       reg = <0x402f0000 0x4000>; +                       status = "okay";
+                       u-boot,dm-spl;

I dont think this part under should go here tell me if im wrong. It should be move outside as a reference.

Not sure what you mean as this is the U-Boot specific device tree include file after all.

Quoted 41 lines
Quoted 41 lines

+                       /*
+                        * Memory configuration from sdram datasheet IS42S16160J-6BLI +                        */
+                       fsl,sdram-mux = /bits/ 8 <MUX_A8_SDRAM_A8
+                                                 MUX_CSX0_SDRAM_CS1
+                                                 0
+                                                 0
+                                                 0
+                                                 0>;
+                       fsl,sdram-control = /bits/ 8 <MEM_WIDTH_16BITS +                                                     BL_8
+                                                     COL_9BITS
+                                                     CL_3>;
+                       fsl,sdram-timing = /bits/ 8 <0x2
+                                                    0x2
+                                                    0x9
+                                                    0x1
+                                                    0x5
+                                                    0x6

arch/arm/dts/imxrt1050-evk-u-boot.dtsi +17 -0
+
+                                                    0x20
+                                                    0x09
+                                                    0x01
+                                                    0x00
+
+                                                    0x04
+                                                    0x0A
+                                                    0x21
+                                                    0x50>;
+
+                       bank1: bank@0 {
+                               fsl,base-address = <0x80000000>;
+                               fsl,memory-size = <MEM_SIZE_32M>;
+                               u-boot,dm-spl;
+                       };
+               };

        };
  };

arch/arm/dts/imxrt1050-evk-u-boot.dtsi +0 -0
@@ -50,7 +98,7 @@
         u-boot,dm-spl;
Quoted 8 lines
Quoted 4 lines
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +0 -0
   };


-&gpt1 {
+&gpt {

Add diff:
        clocks = <&osc>;
        compatible = "fsl,imxrt-gpt";
        status = "okay";

Okay.

Quoted 111 lines
Quoted 111 lines

        u-boot,dm-spl;
  };

arch/arm/dts/imxrt1050-evk-u-boot.dtsi +0 -0
@@ -58,33 +106,108 @@
         u-boot,dm-spl;
   };


-&semc {
-       u-boot,dm-spl;

arch/arm/dts/imxrt1050-evk-u-boot.dtsi +0 -6
-
-       bank1: bank@0 {
-               u-boot,dm-spl;
-       };
-};
-

  &iomuxc {
        u-boot,dm-spl;

        imxrt1050-evk {drop unneeded node ^^^
                u-boot,dm-spl;
-               pinctrl_lpuart1: lpuart1grp {
-                       u-boot,dm-spl;
-               };

                pinctrl_semc: semcgrp {
-                       u-boot,dm-spl;
-               };
-
-               pinctrl_usdhc0: usdhc0grp {
+                       fsl,pins = <
+                               MXRT1050_IOMUXC_GPIO_EMC_00_SEMC_DA00 +                                       0xf1    /* SEMC_D0 */
+                               MXRT1050_IOMUXC_GPIO_EMC_01_SEMC_DA01 +                                       0xf1    /* SEMC_D1 */
+                               MXRT1050_IOMUXC_GPIO_EMC_02_SEMC_DA02 +                                       0xf1    /* SEMC_D2 */
+                               MXRT1050_IOMUXC_GPIO_EMC_03_SEMC_DA03 +                                       0xf1    /* SEMC_D3 */
+                               MXRT1050_IOMUXC_GPIO_EMC_04_SEMC_DA04 +                                       0xf1    /* SEMC_D4 */
+                               MXRT1050_IOMUXC_GPIO_EMC_05_SEMC_DA05 +                                       0xf1    /* SEMC_D5 */
+                               MXRT1050_IOMUXC_GPIO_EMC_06_SEMC_DA06 +                                       0xf1    /* SEMC_D6 */
+                               MXRT1050_IOMUXC_GPIO_EMC_07_SEMC_DA07 +                                       0xf1    /* SEMC_D7 */
+                               MXRT1050_IOMUXC_GPIO_EMC_08_SEMC_DM00 +                                       0xf1    /* SEMC_DM0 */
+                               MXRT1050_IOMUXC_GPIO_EMC_09_SEMC_ADDR00 +                                       0xf1    /* SEMC_A0 */
+                               MXRT1050_IOMUXC_GPIO_EMC_10_SEMC_ADDR01 +                                       0xf1    /* SEMC_A1 */
+                               MXRT1050_IOMUXC_GPIO_EMC_11_SEMC_ADDR02 +                                       0xf1    /* SEMC_A2 */
+                               MXRT1050_IOMUXC_GPIO_EMC_12_SEMC_ADDR03 +                                       0xf1    /* SEMC_A3 */
+                               MXRT1050_IOMUXC_GPIO_EMC_13_SEMC_ADDR04 +                                       0xf1    /* SEMC_A4 */
+                               MXRT1050_IOMUXC_GPIO_EMC_14_SEMC_ADDR05 +                                       0xf1    /* SEMC_A5 */
+                               MXRT1050_IOMUXC_GPIO_EMC_15_SEMC_ADDR06 +                                       0xf1    /* SEMC_A6 */
+                               MXRT1050_IOMUXC_GPIO_EMC_16_SEMC_ADDR07 +                                       0xf1    /* SEMC_A7 */
+                               MXRT1050_IOMUXC_GPIO_EMC_17_SEMC_ADDR08 +                                       0xf1    /* SEMC_A8 */
+                               MXRT1050_IOMUXC_GPIO_EMC_18_SEMC_ADDR09 +                                       0xf1    /* SEMC_A9 */
+                               MXRT1050_IOMUXC_GPIO_EMC_19_SEMC_ADDR11 +                                       0xf1    /* SEMC_A11 */
+                               MXRT1050_IOMUXC_GPIO_EMC_20_SEMC_ADDR12 +                                       0xf1    /* SEMC_A12 */
+                               MXRT1050_IOMUXC_GPIO_EMC_21_SEMC_BA0 +                                       0xf1    /* SEMC_BA0 */
+                               MXRT1050_IOMUXC_GPIO_EMC_22_SEMC_BA1 +                                       0xf1    /* SEMC_BA1 */
+                               MXRT1050_IOMUXC_GPIO_EMC_23_SEMC_ADDR10 +                                       0xf1    /* SEMC_A10 */
+                               MXRT1050_IOMUXC_GPIO_EMC_24_SEMC_CAS +                                       0xf1    /* SEMC_CAS */
+                               MXRT1050_IOMUXC_GPIO_EMC_25_SEMC_RAS +                                       0xf1    /* SEMC_RAS */
+                               MXRT1050_IOMUXC_GPIO_EMC_26_SEMC_CLK +                                       0xf1    /* SEMC_CLK */
+                               MXRT1050_IOMUXC_GPIO_EMC_27_SEMC_CKE +                                       0xf1    /* SEMC_CKE */
+                               MXRT1050_IOMUXC_GPIO_EMC_28_SEMC_WE +                                       0xf1    /* SEMC_WE */
+                               MXRT1050_IOMUXC_GPIO_EMC_29_SEMC_CS0 +                                       0xf1    /* SEMC_CS0 */
+                               MXRT1050_IOMUXC_GPIO_EMC_30_SEMC_DA08 +                                       0xf1    /* SEMC_D8 */
+                               MXRT1050_IOMUXC_GPIO_EMC_31_SEMC_DA09 +                                       0xf1    /* SEMC_D9 */
+                               MXRT1050_IOMUXC_GPIO_EMC_32_SEMC_DA10 +                                       0xf1    /* SEMC_D10 */
+                               MXRT1050_IOMUXC_GPIO_EMC_33_SEMC_DA11 +                                       0xf1    /* SEMC_D11 */
+                               MXRT1050_IOMUXC_GPIO_EMC_34_SEMC_DA12 +                                       0xf1    /* SEMC_D12 */
+                               MXRT1050_IOMUXC_GPIO_EMC_35_SEMC_DA13 +                                       0xf1    /* SEMC_D13 */
+                               MXRT1050_IOMUXC_GPIO_EMC_36_SEMC_DA14 +                                       0xf1    /* SEMC_D14 */
+                               MXRT1050_IOMUXC_GPIO_EMC_37_SEMC_DA15 +                                       0xf1    /* SEMC_D15 */
+                               MXRT1050_IOMUXC_GPIO_EMC_38_SEMC_DM01 +                                       0xf1    /* SEMC_DM1 */
+                               MXRT1050_IOMUXC_GPIO_EMC_39_SEMC_DQS +                                       (IMX_PAD_SION | 0xf1)   /* SEMC_DQS */ +                       >;

Quoted 8 lines
Quoted 6 lines

                        u-boot,dm-spl;
                };
        };
  };

+&pinctrl_lpuart1 {

Add diff:
        compatible = "fsl,imxrt-lpuart";

You probably meant that to go under the lpuart1 node but I got your point.

Quoted 6 lines

arch/arm/dts/imxrt1050-evk-u-boot.dtsi line 207

Quoted 4 lines

+       u-boot,dm-spl;

arch/arm/dts/imxrt1050-evk-u-boot.dtsi +3 -0
+};
+
+&pinctrl_usdhc0 {

Add diff:
        compatible = "fsl,imxrt-usdhc";

And this under the usdhc1 one.

Quoted 2 lines

I tested this
https://github.com/Mr-Bossman/u-boot/commit/42a7f430d761bb4d44f646a27649deda15352f2e

That commit seems totally different from any of this series. Not sure.

Quoted 4 lines

Some note for future, check if the compatibles are the same they arent here so the soc.dtsi will be broken. Also wait a bit for other people to resopnd to patches before sending out v2 because no one commented on the other patches yet.

Sure, sure.

Cheers

Marcel

Quoted 602 lines

Thanks,
Jesse

Quoted 600 lines

+       u-boot,dm-spl;

arch/arm/dts/imxrt1050-evk-u-boot.dtsi +2 -0
+};
+

  &usdhc1 {
        u-boot,dm-spl;
  };

arch/arm/dts/imxrt1050-evk.dts +1 -1
index fb2da3adfcf..6a9c10decf5 100644
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
   /*
    * Copyright (C) 2019
    * Author(s): Giulio Benetti <[email protected]>
@@ -6,7 +6,6 @@


  /dts-v1/;
  #include "imxrt1050.dtsi"
-#include "imxrt1050-evk-u-boot.dtsi"
  #include "imxrt1050-pinfunc.h"

  / {

arch/arm/dts/imxrt1050-evk.dts +0 -0
@@ -14,210 +13,52 @@
         compatible = "fsl,imxrt1050-evk", "fsl,imxrt1050";


        chosen {
-               bootargs = "root=/dev/ram";
-               stdout-path = "serial0:115200n8";
-               tick-timer = &gpt1;
+               stdout-path = &lpuart1;
        };

-       memory {
+       aliases {
+               gpio0 = &gpio1;
+               gpio1 = &gpio2;
+               gpio2 = &gpio3;
+               gpio3 = &gpio4;
+               gpio4 = &gpio5;
+               mmc0 = &usdhc1;
+               serial0 = &lpuart1;
+       };
+
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x2000000>;
        };
  };

-&lpuart1 { /* console */
+&lpuart1 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_lpuart1>;
        status = "okay";
  };

-&semc {
-       /*
-        * Memory configuration from sdram datasheet IS42S16160J-6BLI -        */
-       fsl,sdram-mux = /bits/ 8 <MUX_A8_SDRAM_A8
-                               MUX_CSX0_SDRAM_CS1
-                               0
-                               0
-                               0
-                               0>;
-       fsl,sdram-control = /bits/ 8 <MEM_WIDTH_16BITS
-                                       BL_8
-                                       COL_9BITS
-                                       CL_3>;
-       fsl,sdram-timing = /bits/ 8 <0x2
-                                    0x2
-                                    0x9
-                                    0x1
-                                    0x5
-                                    0x6

arch/arm/dts/imxrt1050-evk.dts +0 -17
-
-                                    0x20
-                                    0x09
-                                    0x01
-                                    0x00
-
-                                    0x04
-                                    0x0A
-                                    0x21
-                                    0x50>;
-
-       bank1: bank@0 {
-               fsl,base-address = <0x80000000>;
-               fsl,memory-size = <MEM_SIZE_32M>;
-       };
-};
-

  &iomuxc {
        pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_lpuart1>;

arch/arm/dts/imxrt1050-evk.dts +5 -142
-
-       imxrt1050-evk {
-               pinctrl_lpuart1: lpuart1grp {
-                       fsl,pins = <
-                               MXRT1050_IOMUXC_GPIO_AD_B0_12_LPUART1_TXD
-                                       0xf1
-                               MXRT1050_IOMUXC_GPIO_AD_B0_13_LPUART1_RXD
-                                       0xf1
-                       >;
-               };
-
-               pinctrl_semc: semcgrp {
-                       fsl,pins = <
-                               MXRT1050_IOMUXC_GPIO_EMC_00_SEMC_DA00
-                                       0xf1    /* SEMC_D0 */
-                               MXRT1050_IOMUXC_GPIO_EMC_01_SEMC_DA01
-                                       0xf1    /* SEMC_D1 */
-                               MXRT1050_IOMUXC_GPIO_EMC_02_SEMC_DA02
-                                       0xf1    /* SEMC_D2 */
-                               MXRT1050_IOMUXC_GPIO_EMC_03_SEMC_DA03
-                                       0xf1    /* SEMC_D3 */
-                               MXRT1050_IOMUXC_GPIO_EMC_04_SEMC_DA04
-                                       0xf1    /* SEMC_D4 */
-                               MXRT1050_IOMUXC_GPIO_EMC_05_SEMC_DA05
-                                       0xf1    /* SEMC_D5 */
-                               MXRT1050_IOMUXC_GPIO_EMC_06_SEMC_DA06
-                                       0xf1    /* SEMC_D6 */
-                               MXRT1050_IOMUXC_GPIO_EMC_07_SEMC_DA07
-                                       0xf1    /* SEMC_D7 */
-                               MXRT1050_IOMUXC_GPIO_EMC_08_SEMC_DM00
-                                       0xf1    /* SEMC_DM0 */
-                               MXRT1050_IOMUXC_GPIO_EMC_09_SEMC_ADDR00
-                                       0xf1    /* SEMC_A0 */
-                               MXRT1050_IOMUXC_GPIO_EMC_10_SEMC_ADDR01
-                                       0xf1    /* SEMC_A1 */
-                               MXRT1050_IOMUXC_GPIO_EMC_11_SEMC_ADDR02
-                                       0xf1    /* SEMC_A2 */
-                               MXRT1050_IOMUXC_GPIO_EMC_12_SEMC_ADDR03
-                                       0xf1    /* SEMC_A3 */
-                               MXRT1050_IOMUXC_GPIO_EMC_13_SEMC_ADDR04
-                                       0xf1    /* SEMC_A4 */
-                               MXRT1050_IOMUXC_GPIO_EMC_14_SEMC_ADDR05
-                                       0xf1    /* SEMC_A5 */
-                               MXRT1050_IOMUXC_GPIO_EMC_15_SEMC_ADDR06
-                                       0xf1    /* SEMC_A6 */
-                               MXRT1050_IOMUXC_GPIO_EMC_16_SEMC_ADDR07
-                                       0xf1    /* SEMC_A7 */
-                               MXRT1050_IOMUXC_GPIO_EMC_17_SEMC_ADDR08
-                                       0xf1    /* SEMC_A8 */
-                               MXRT1050_IOMUXC_GPIO_EMC_18_SEMC_ADDR09
-                                       0xf1    /* SEMC_A9 */
-                               MXRT1050_IOMUXC_GPIO_EMC_19_SEMC_ADDR11
-                                       0xf1    /* SEMC_A11 */
-                               MXRT1050_IOMUXC_GPIO_EMC_20_SEMC_ADDR12
-                                       0xf1    /* SEMC_A12 */
-                               MXRT1050_IOMUXC_GPIO_EMC_21_SEMC_BA0
-                                       0xf1    /* SEMC_BA0 */
-                               MXRT1050_IOMUXC_GPIO_EMC_22_SEMC_BA1
-                                       0xf1    /* SEMC_BA1 */
-                               MXRT1050_IOMUXC_GPIO_EMC_23_SEMC_ADDR10
-                                       0xf1    /* SEMC_A10 */
-                               MXRT1050_IOMUXC_GPIO_EMC_24_SEMC_CAS
-                                       0xf1    /* SEMC_CAS */
-                               MXRT1050_IOMUXC_GPIO_EMC_25_SEMC_RAS
-                                       0xf1    /* SEMC_RAS */
-                               MXRT1050_IOMUXC_GPIO_EMC_26_SEMC_CLK
-                                       0xf1    /* SEMC_CLK */
-                               MXRT1050_IOMUXC_GPIO_EMC_27_SEMC_CKE
-                                       0xf1    /* SEMC_CKE */
-                               MXRT1050_IOMUXC_GPIO_EMC_28_SEMC_WE
-                                       0xf1    /* SEMC_WE */
-                               MXRT1050_IOMUXC_GPIO_EMC_29_SEMC_CS0
-                                       0xf1    /* SEMC_CS0 */
-                               MXRT1050_IOMUXC_GPIO_EMC_30_SEMC_DA08
-                                       0xf1    /* SEMC_D8 */
-                               MXRT1050_IOMUXC_GPIO_EMC_31_SEMC_DA09
-                                       0xf1    /* SEMC_D9 */
-                               MXRT1050_IOMUXC_GPIO_EMC_32_SEMC_DA10
-                                       0xf1    /* SEMC_D10 */
-                               MXRT1050_IOMUXC_GPIO_EMC_33_SEMC_DA11
-                                       0xf1    /* SEMC_D11 */
-                               MXRT1050_IOMUXC_GPIO_EMC_34_SEMC_DA12
-                                       0xf1    /* SEMC_D12 */
-                               MXRT1050_IOMUXC_GPIO_EMC_35_SEMC_DA13
-                                       0xf1    /* SEMC_D13 */
-                               MXRT1050_IOMUXC_GPIO_EMC_36_SEMC_DA14
-                                       0xf1    /* SEMC_D14 */
-                               MXRT1050_IOMUXC_GPIO_EMC_37_SEMC_DA15
-                                       0xf1    /* SEMC_D15 */
-                               MXRT1050_IOMUXC_GPIO_EMC_38_SEMC_DM01
-                                       0xf1    /* SEMC_DM1 */
-                               MXRT1050_IOMUXC_GPIO_EMC_39_SEMC_DQS
-                                       (IMX_PAD_SION | 0xf1)   /* SEMC_DQS */
-                       >;
-               };
-
-               pinctrl_usdhc0: usdhc0grp {
-                       fsl,pins = <
-                               MXRT1050_IOMUXC_GPIO_B1_12_USDHC1_CD_B
-                                       0x1B000
-                               MXRT1050_IOMUXC_GPIO_B1_14_USDHC1_VSELECT
-                                       0xB069
-                               MXRT1050_IOMUXC_GPIO_SD_B0_00_USDHC1_CMD
-                                       0x17061
-                               MXRT1050_IOMUXC_GPIO_SD_B0_01_USDHC1_CLK
-                                       0x17061
-                               MXRT1050_IOMUXC_GPIO_SD_B0_05_USDHC1_DATA3
-                                       0x17061
-                               MXRT1050_IOMUXC_GPIO_SD_B0_04_USDHC1_DATA2
-                                       0x17061
-                               MXRT1050_IOMUXC_GPIO_SD_B0_03_USDHC1_DATA1
-                                       0x17061
-                               MXRT1050_IOMUXC_GPIO_SD_B0_02_USDHC1_DATA0
-                                       0x17061
-                       >;
-               };
-
-               pinctrl_lcdif: lcdifgrp {
-                       fsl,pins = <
-                               MXRT1050_IOMUXC_GPIO_B0_00_LCD_CLK              0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_01_LCD_ENABLE           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_02_LCD_HSYNC            0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_03_LCD_VSYNC            0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_04_LCD_DATA00           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_05_LCD_DATA01           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_06_LCD_DATA02           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_07_LCD_DATA03           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_08_LCD_DATA04           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_09_LCD_DATA05           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_10_LCD_DATA06           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_11_LCD_DATA07           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_12_LCD_DATA08           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_13_LCD_DATA09           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_14_LCD_DATA10           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_15_LCD_DATA11           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B1_01_LCD_DATA13           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B1_02_LCD_DATA14           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B1_03_LCD_DATA15           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B1_15_GPIO2_IO31           0x0b069
-                               MXRT1050_IOMUXC_GPIO_AD_B0_02_GPIO1_IO02        0x0b069
-                       >;
-               };
+       pinctrl_lpuart1: lpuart1grp {
+               fsl,pins = <
+                       MXRT1050_IOMUXC_GPIO_AD_B0_12_LPUART1_TXD       0xf1
+                       MXRT1050_IOMUXC_GPIO_AD_B0_13_LPUART1_RXD       0xf1
+               >;

        };
-};

-&gpt1 {
-       status = "okay";
+       pinctrl_usdhc0: usdhc0grp {
+               fsl,pins = <
+                       MXRT1050_IOMUXC_GPIO_B1_12_USDHC1_CD_B          0x1B000 +                       MXRT1050_IOMUXC_GPIO_B1_14_USDHC1_VSELECT       0xB069 +                       MXRT1050_IOMUXC_GPIO_SD_B0_00_USDHC1_CMD        0x17061 +                       MXRT1050_IOMUXC_GPIO_SD_B0_01_USDHC1_CLK        0x17061 +                       MXRT1050_IOMUXC_GPIO_SD_B0_05_USDHC1_DATA3      0x17061 +                       MXRT1050_IOMUXC_GPIO_SD_B0_04_USDHC1_DATA2      0x17061 +                       MXRT1050_IOMUXC_GPIO_SD_B0_03_USDHC1_DATA1      0x17061 +                       MXRT1050_IOMUXC_GPIO_SD_B0_02_USDHC1_DATA0      0x17061 +               >;
+       };
  };

  &usdhc1 {

arch/arm/dts/imxrt1050-evk.dts +0 -36
@@ -226,42 +67,6 @@
         pinctrl-1 = <&pinctrl_usdhc0>;
         pinctrl-2 = <&pinctrl_usdhc0>;
         pinctrl-3 = <&pinctrl_usdhc0>;
-       status = "okay";
-
         cd-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;
-};
-
-&lcdif {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_lcdif>;
-       display = <&display0>;
-       status = "okay";
-
-       display0: display0 {
-               bits-per-pixel = <16>;
-               bus-width = <16>;
-
-               display-timings {
-                       timing0: timing0 {
-                               clock-frequency = <9300000>;
-                               hactive = <480>;
-                               vactive = <272>;
-                               hback-porch = <4>;
-                               hfront-porch = <8>;
-                               vback-porch = <4>;
-                               vfront-porch = <8>;
-                               hsync-len = <41>;
-                               vsync-len = <10>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                       };
-               };
-       };
-};
-
-&usbotg1 {
-       dr_mode = "host";
         status = "okay";
   };
arch/arm/dts/imxrt1050-pinfunc.h +1 -1
index a29031ab3de..22c14a3262a 100644
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
   /*
    * Copyright (C) 2019
    * Author(s): Giulio Benetti <[email protected]>
arch/arm/dts/imxrt1050.dtsi +1 -2
index 09f4712af68..03e6a858a7b 100644
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
   /*
    * Copyright (C) 2019
    * Author(s): Giulio Benetti <[email protected]>
@@ -8,53 +8,37 @@
   #include <dt-bindings/interrupt-controller/arm-gic.h>
   #include <dt-bindings/clock/imxrt1050-clock.h>
   #include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/memory/imxrt-sdram.h>


  / {
        #address-cells = <1>;
        #size-cells = <1>;

-       aliases {
-               display0 = &lcdif;
-               gpio0 = &gpio1;
-               gpio1 = &gpio2;
-               gpio2 = &gpio3;
-               gpio3 = &gpio4;
-               gpio4 = &gpio5;
-               mmc0 = &usdhc1;
-               serial0 = &lpuart1;
-               usbphy0 = &usbphy1;
-       };
-
        clocks {
                osc: osc {
-                       compatible = "fsl,imx-osc", "fixed-clock";
+                       compatible = "fixed-clock";
                        #clock-cells = <0>;
                        clock-frequency = <24000000>;
                };
-       };

-       soc {
-               semc: semc@402f0000 {
-                       compatible = "fsl,imxrt-semc";
-                       reg = <0x402f0000 0x4000>;
-                       clocks = <&clks IMXRT1050_CLK_SEMC>;
-                       pinctrl-0 = <&pinctrl_semc>;
-                       pinctrl-names = "default";
-                       status = "okay";
+               osc3M: osc3M {
+                       compatible = "fixed-clock";
+                       #clock-cells = <0>;
+                       clock-frequency = <3000000>;
                };
+       };

+       soc {
                lpuart1: serial@40184000 {
-                       compatible = "fsl,imxrt-lpuart";
+                       compatible = "fsl,imxrt1050-lpuart", "fsl,imx7ulp-lpuart"; reg = <0x40184000 0x4000>;
-                       interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; +                       interrupts = <20>;
                        clocks = <&clks IMXRT1050_CLK_LPUART1>;
-                       clock-names = "per";
+                       clock-names = "ipg";
                        status = "disabled";
                };

-               iomuxc: iomuxc@401f8000 {
-                       compatible = "fsl,imxrt-iomuxc";
+               iomuxc: pinctrl@401f8000 {
+                       compatible = "fsl,imxrt1050-iomuxc";
                        reg = <0x401f8000 0x4000>;
                        fsl,mux_mask = <0x7>;
                };

arch/arm/dts/imxrt1050.dtsi +0 -0
@@ -64,31 +48,61 @@
                         reg = <0x400d8000 0x4000>;
                 };


-               clks: ccm@400fc000 {
+               clks: clock-controller@400fc000 { compatible = "fsl,imxrt1050-ccm"; reg = <0x400fc000 0x4000>;
-                       interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>, -                                    <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>; +                       interrupts = <95>, <96>;
+                       clocks = <&osc>;
+                       clock-names = "osc";
                        #clock-cells = <1>;
-               };

arch/arm/dts/imxrt1050.dtsi +35 -7
-
-               usdhc1: usdhc@402c0000 {
-                       compatible = "fsl,imxrt-usdhc";
-                       reg = <0x402c0000 0x10000>;
-                       interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&clks IMXRT1050_CLK_USDHC1>;
-                       clock-names = "per";
+                       assigned-clocks = <&clks IMXRT1050_CLK_PLL1_BYPASS>,
+                               <&clks IMXRT1050_CLK_PLL1_BYPASS>,
+                               <&clks IMXRT1050_CLK_PLL2_BYPASS>,
+                               <&clks IMXRT1050_CLK_PLL3_BYPASS>,
+                               <&clks IMXRT1050_CLK_PLL3_PFD1_664_62M>,
+                               <&clks IMXRT1050_CLK_PLL2_PFD2_396M>;
+                       assigned-clock-parents = <&clks IMXRT1050_CLK_PLL1_REF_SEL>,
+                               <&clks IMXRT1050_CLK_PLL1_ARM>,
+                               <&clks IMXRT1050_CLK_PLL2_SYS>,
+                               <&clks IMXRT1050_CLK_PLL3_USB_OTG>,
+                               <&clks IMXRT1050_CLK_PLL3_USB_OTG>,
+                               <&clks IMXRT1050_CLK_PLL2_SYS>;
+               };
+
+               edma1: dma-controller@400e8000 {
+                       #dma-cells = <2>;
+                       compatible = "fsl,imx7ulp-edma";
+                       reg = <0x400e8000 0x4000>,
+                               <0x400ec000 0x4000>;
+                       dma-channels = <32>;
+                       interrupts = <0>, <1>, <2>, <3>, <4>, <5>, <6>, <7>, <8>,
+                               <9>, <10>, <11>, <12>, <13>, <14>, <15>, <16>;
+                       clock-names = "dma", "dmamux0";
+                       clocks = <&clks IMXRT1050_CLK_DMA>,
+                                <&clks IMXRT1050_CLK_DMA_MUX>;
+               };
+
+               usdhc1: mmc@402c0000 {
+                       compatible = "fsl,imxrt1050-usdhc", "fsl,imx6sl-usdhc";
+                       reg = <0x402c0000 0x4000>;
+                       interrupts = <110>;
+                       clocks = <&clks IMXRT1050_CLK_IPG_PDOF>,
+                               <&clks IMXRT1050_CLK_OSC>,
+                               <&clks IMXRT1050_CLK_USDHC1>;
+                       clock-names = "ipg", "ahb", "per";

                        bus-width = <4>;
+                       fsl,wp-controller;
+                       no-1-8-v;
+                       max-frequency = <4000000>; fsl,tuning-start-tap = <20>;
-                       fsl,tuning-step= <2>;
+                       fsl,tuning-step = <2>;
                        status = "disabled";
                };

                gpio1: gpio@401b8000 {
-                       compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio"; +                       compatible = "fsl,imxrt1050-gpio", "fsl,imx35-gpio"; reg = <0x401b8000 0x4000>;
-                       interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>, -                                    <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>; +                       interrupts = <80>, <81>; gpio-controller;
                        #gpio-cells = <2>;
                        interrupt-controller;

arch/arm/dts/imxrt1050.dtsi +0 -0
@@ -96,10 +110,9 @@
                 };


                gpio2: gpio@401bc000 {
-                       compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio"; +                       compatible = "fsl,imxrt1050-gpio", "fsl,imx35-gpio"; reg = <0x401bc000 0x4000>;
-                       interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>, -                               <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>; +                       interrupts = <82>, <83>; gpio-controller;
                        #gpio-cells = <2>;
                        interrupt-controller;

arch/arm/dts/imxrt1050.dtsi +0 -0
@@ -107,10 +120,9 @@
                 };


                gpio3: gpio@401c0000 {
-                       compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio"; +                       compatible = "fsl,imxrt1050-gpio", "fsl,imx35-gpio"; reg = <0x401c0000 0x4000>;
-                       interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>, -                               <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>; +                       interrupts = <84>, <85>; gpio-controller;
                        #gpio-cells = <2>;
                        interrupt-controller;

arch/arm/dts/imxrt1050.dtsi +0 -0
@@ -118,10 +130,9 @@
                 };


                gpio4: gpio@401c4000 {
-                       compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio"; +                       compatible = "fsl,imxrt1050-gpio", "fsl,imx35-gpio"; reg = <0x401c4000 0x4000>;
-                       interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>, -                                       <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>; +                       interrupts = <86>, <87>; gpio-controller;
                        #gpio-cells = <2>;
                        interrupt-controller;

arch/arm/dts/imxrt1050.dtsi +0 -0
@@ -129,60 +140,21 @@
                 };


                gpio5: gpio@400c0000 {
-                       compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio";
+                       compatible = "fsl,imxrt1050-gpio", "fsl,imx35-gpio"; reg = <0x400c0000 0x4000>;
-                       interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>,
-                               <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <88>, <89>;
                        gpio-controller;
                        #gpio-cells = <2>;
                        interrupt-controller;
                        #interrupt-cells = <2>;
                };

-               lcdif: lcdif@402b8000 {
-                       compatible = "fsl,imxrt-lcdif";
-                       reg = <0x402b8000 0x4000>;
-                       interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&clks IMXRT1050_CLK_LCDIF_PIX>,
-                                <&clks IMXRT1050_CLK_LCDIF_APB>;
-                       clock-names = "pix", "axi";
-                       assigned-clocks = <&clks IMXRT1050_CLK_LCDIF_SEL>;
-                       assigned-clock-parents = <&clks IMXRT1050_CLK_PLL5_VIDEO>; -                       status = "disabled";
-               };
-
-               gpt1: gpt1@401ec000 {
-                       compatible = "fsl,imxrt-gpt";
+               gpt: timer@401ec000 {
+                       compatible = "fsl,imxrt1050-gpt", "fsl,imx6dl-gpt", "fsl,imx6sl-gpt"; reg = <0x401ec000 0x4000>;
                        interrupts = <100>;
-                       clocks = <&osc>;
-                       status = "disabled";
-               };

arch/arm/dts/imxrt1050.dtsi +2 -25
-
-               usbphy1: usbphy@400d9000 {
-                       compatible = "fsl,imxrt-usbphy";
-                       reg = <0x400d9000 0x1000>;
-                       interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
-               };
-
-               usbmisc: usbmisc@402e0800 {
-                       #index-cells = <1>;
-                       compatible = "fsl,imxrt-usbmisc";
-                       reg = <0x402e0800 0x200>;
-                       clocks = <&clks IMXRT1050_CLK_USBOH3>;
-               };
-
-               usbotg1: usb@402e0000 {
-                       compatible = "fsl,imxrt-usb", "fsl,imx27-usb";
-                       reg = <0x402e0000 0x200>;
-                       interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&clks IMXRT1050_CLK_USBOH3>;
-                       fsl,usbphy = <&usbphy1>;
-                       fsl,usbmisc = <&usbmisc 0>;
-                       ahb-burst-config = <0x0>;
-                       tx-burst-size-dword = <0x10>;
-                       rx-burst-size-dword = <0x10>;
-                       status = "disabled";
+                       clocks = <&osc3M>;
+                       clock-names = "per";

                };
        };
  };

include/dt-bindings/clock/imxrt1050-clock.h +7 -2
index f74dbbcf937..93bef0832d1 100644
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
   /*
    * Copyright(C) 2019
    * Author(s): Giulio Benetti <[email protected]>
@@ -62,6 +62,11 @@
   #define IMXRT1050_CLK_PLL7_USB_HOST           53
   #define IMXRT1050_CLK_LCDIF_PIX                       54
   #define IMXRT1050_CLK_USBOH3                  55
-#define IMXRT1050_CLK_END                      56
+#define IMXRT1050_CLK_IPG_PDOF                 56
+#define IMXRT1050_CLK_PER_CLK_SEL              57
+#define IMXRT1050_CLK_PER_PDOF                 58
+#define IMXRT1050_CLK_DMA                      59
+#define IMXRT1050_CLK_DMA_MUX                  60
+#define IMXRT1050_CLK_END                      61


  #endif /* __DT_BINDINGS_CLOCK_IMXRT1050_H */

#6 lore raw

Re: [PATCH v2 3/8] imxrt1050: synchronise device tree with linux

Quoted 247 lines · Marcel Ziswiler

Hi Jesse

Sorry, I kinda missed your reply and imx maintainership was quiet for quite some time. I am now preparing a v3 taking your feedback into account. Thanks!

Quoted 29 lines · Jesse Taube
Quoted 26 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v6.0-rc1.

---

Changes in v2:
- imxrt1050: Re-added DDR timings aka semc node as pointed out by Fabio. Thanks!

   arch/arm/dts/imxrt1050-evk-u-boot.dtsi      | 155 ++++++++++--
   arch/arm/dts/imxrt1050-evk.dts              | 257 +++-----------------
   arch/arm/dts/imxrt1050-pinfunc.h            |   2 +-
   arch/arm/dts/imxrt1050.dtsi                 | 168 ++++++-------
   include/dt-bindings/clock/imxrt1050-clock.h |   9 +-
   5 files changed, 248 insertions(+), 343 deletions(-)
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +0 -0
index 617cece448a..7db53b19c2f 100644
@@ -4,6 +4,8 @@
    * Author(s): Giulio Benetti <[email protected]>
    */
 
Quoted 3 lines

arch/arm/dts/imxrt1050-evk-u-boot.dtsi line 8

Quoted 2 lines
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +2 -0
+#include <dt-bindings/memory/imxrt-sdram.h>
+

#include "imxrt1050-pinfunc.h"

Okay.

Quoted 4 lines

arch/arm/dts/imxrt1050-evk-u-boot.dtsi line 11

Quoted 3 lines
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +0 -0
   / {
         chosen {
                 u-boot,dm-spl;

diff says tick-timer = &gpt; its important for boot

Okay.

Quoted 15 lines

arch/arm/dts/imxrt1050-evk-u-boot.dtsi line 28

Quoted 13 lines
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +9 -0
@@ -15,6 +17,52 @@
 
         soc {
                 u-boot,dm-spl;
+
+               semc@402f0000 {
+                       compatible = "fsl,imxrt-semc";
+                       clocks = <&clks IMXRT1050_CLK_SEMC>;
+                       pinctrl-0 = <&pinctrl_semc>;
+                       pinctrl-names = "default";
+                       reg = <0x402f0000 0x4000>;
+                       status = "okay";
+                       u-boot,dm-spl;

I dont think this part under should go here tell me if im wrong. It should be move outside as a reference.

Not sure what you mean as this is the U-Boot specific device tree include file after all.

Quoted 43 lines
Quoted 43 lines
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +36 -0
+                       /*
+                        * Memory configuration from sdram datasheet IS42S16160J-6BLI
+                        */
+                       fsl,sdram-mux = /bits/ 8 <MUX_A8_SDRAM_A8
+                                                 MUX_CSX0_SDRAM_CS1
+                                                 0
+                                                 0
+                                                 0
+                                                 0>;
+                       fsl,sdram-control = /bits/ 8 <MEM_WIDTH_16BITS
+                                                     BL_8
+                                                     COL_9BITS
+                                                     CL_3>;
+                       fsl,sdram-timing = /bits/ 8 <0x2
+                                                    0x2
+                                                    0x9
+                                                    0x1
+                                                    0x5
+                                                    0x6
+
+                                                    0x20
+                                                    0x09
+                                                    0x01
+                                                    0x00
+
+                                                    0x04
+                                                    0x0A
+                                                    0x21
+                                                    0x50>;
+
+                       bank1: bank@0 {
+                               fsl,base-address = <0x80000000>;
+                               fsl,memory-size = <MEM_SIZE_32M>;
+                               u-boot,dm-spl;
+                       };
+               };
         };
   };
 
@@ -50,7 +98,7 @@
         u-boot,dm-spl;
   };
 
Quoted 6 lines

arch/arm/dts/imxrt1050-evk-u-boot.dtsi line 101

Quoted 2 lines
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +1 -1
-&gpt1 {
+&gpt {

Add diff:
        clocks = <&osc>;
        compatible = "fsl,imxrt-gpt";
        status = "okay";

Okay.

Quoted 116 lines
Quoted 116 lines
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +82 -15
         u-boot,dm-spl;
   };
 
@@ -58,33 +106,108 @@
         u-boot,dm-spl;
   };
 
-&semc {
-       u-boot,dm-spl;
-
-       bank1: bank@0 {
-               u-boot,dm-spl;
-       };
-};
-
   &iomuxc {
         u-boot,dm-spl;
 
         imxrt1050-evk {drop unneeded node ^^^
                 u-boot,dm-spl;
-               pinctrl_lpuart1: lpuart1grp {
-                       u-boot,dm-spl;
-               };
 
                 pinctrl_semc: semcgrp {
-                       u-boot,dm-spl;
-               };
-
-               pinctrl_usdhc0: usdhc0grp {
+                       fsl,pins = <
+                               MXRT1050_IOMUXC_GPIO_EMC_00_SEMC_DA00
+                                       0xf1    /* SEMC_D0 */
+                               MXRT1050_IOMUXC_GPIO_EMC_01_SEMC_DA01
+                                       0xf1    /* SEMC_D1 */
+                               MXRT1050_IOMUXC_GPIO_EMC_02_SEMC_DA02
+                                       0xf1    /* SEMC_D2 */
+                               MXRT1050_IOMUXC_GPIO_EMC_03_SEMC_DA03
+                                       0xf1    /* SEMC_D3 */
+                               MXRT1050_IOMUXC_GPIO_EMC_04_SEMC_DA04
+                                       0xf1    /* SEMC_D4 */
+                               MXRT1050_IOMUXC_GPIO_EMC_05_SEMC_DA05
+                                       0xf1    /* SEMC_D5 */
+                               MXRT1050_IOMUXC_GPIO_EMC_06_SEMC_DA06
+                                       0xf1    /* SEMC_D6 */
+                               MXRT1050_IOMUXC_GPIO_EMC_07_SEMC_DA07
+                                       0xf1    /* SEMC_D7 */
+                               MXRT1050_IOMUXC_GPIO_EMC_08_SEMC_DM00
+                                       0xf1    /* SEMC_DM0 */
+                               MXRT1050_IOMUXC_GPIO_EMC_09_SEMC_ADDR00
+                                       0xf1    /* SEMC_A0 */
+                               MXRT1050_IOMUXC_GPIO_EMC_10_SEMC_ADDR01
+                                       0xf1    /* SEMC_A1 */
+                               MXRT1050_IOMUXC_GPIO_EMC_11_SEMC_ADDR02
+                                       0xf1    /* SEMC_A2 */
+                               MXRT1050_IOMUXC_GPIO_EMC_12_SEMC_ADDR03
+                                       0xf1    /* SEMC_A3 */
+                               MXRT1050_IOMUXC_GPIO_EMC_13_SEMC_ADDR04
+                                       0xf1    /* SEMC_A4 */
+                               MXRT1050_IOMUXC_GPIO_EMC_14_SEMC_ADDR05
+                                       0xf1    /* SEMC_A5 */
+                               MXRT1050_IOMUXC_GPIO_EMC_15_SEMC_ADDR06
+                                       0xf1    /* SEMC_A6 */
+                               MXRT1050_IOMUXC_GPIO_EMC_16_SEMC_ADDR07
+                                       0xf1    /* SEMC_A7 */
+                               MXRT1050_IOMUXC_GPIO_EMC_17_SEMC_ADDR08
+                                       0xf1    /* SEMC_A8 */
+                               MXRT1050_IOMUXC_GPIO_EMC_18_SEMC_ADDR09
+                                       0xf1    /* SEMC_A9 */
+                               MXRT1050_IOMUXC_GPIO_EMC_19_SEMC_ADDR11
+                                       0xf1    /* SEMC_A11 */
+                               MXRT1050_IOMUXC_GPIO_EMC_20_SEMC_ADDR12
+                                       0xf1    /* SEMC_A12 */
+                               MXRT1050_IOMUXC_GPIO_EMC_21_SEMC_BA0
+                                       0xf1    /* SEMC_BA0 */
+                               MXRT1050_IOMUXC_GPIO_EMC_22_SEMC_BA1
+                                       0xf1    /* SEMC_BA1 */
+                               MXRT1050_IOMUXC_GPIO_EMC_23_SEMC_ADDR10
+                                       0xf1    /* SEMC_A10 */
+                               MXRT1050_IOMUXC_GPIO_EMC_24_SEMC_CAS
+                                       0xf1    /* SEMC_CAS */
+                               MXRT1050_IOMUXC_GPIO_EMC_25_SEMC_RAS
+                                       0xf1    /* SEMC_RAS */
+                               MXRT1050_IOMUXC_GPIO_EMC_26_SEMC_CLK
+                                       0xf1    /* SEMC_CLK */
+                               MXRT1050_IOMUXC_GPIO_EMC_27_SEMC_CKE
+                                       0xf1    /* SEMC_CKE */
+                               MXRT1050_IOMUXC_GPIO_EMC_28_SEMC_WE
+                                       0xf1    /* SEMC_WE */
+                               MXRT1050_IOMUXC_GPIO_EMC_29_SEMC_CS0
+                                       0xf1    /* SEMC_CS0 */
+                               MXRT1050_IOMUXC_GPIO_EMC_30_SEMC_DA08
+                                       0xf1    /* SEMC_D8 */
+                               MXRT1050_IOMUXC_GPIO_EMC_31_SEMC_DA09
+                                       0xf1    /* SEMC_D9 */
+                               MXRT1050_IOMUXC_GPIO_EMC_32_SEMC_DA10
+                                       0xf1    /* SEMC_D10 */
+                               MXRT1050_IOMUXC_GPIO_EMC_33_SEMC_DA11
+                                       0xf1    /* SEMC_D11 */
+                               MXRT1050_IOMUXC_GPIO_EMC_34_SEMC_DA12
+                                       0xf1    /* SEMC_D12 */
+                               MXRT1050_IOMUXC_GPIO_EMC_35_SEMC_DA13
+                                       0xf1    /* SEMC_D13 */
+                               MXRT1050_IOMUXC_GPIO_EMC_36_SEMC_DA14
+                                       0xf1    /* SEMC_D14 */
+                               MXRT1050_IOMUXC_GPIO_EMC_37_SEMC_DA15
+                                       0xf1    /* SEMC_D15 */
+                               MXRT1050_IOMUXC_GPIO_EMC_38_SEMC_DM01
+                                       0xf1    /* SEMC_DM1 */
+                               MXRT1050_IOMUXC_GPIO_EMC_39_SEMC_DQS
+                                       (IMX_PAD_SION | 0xf1)   /* SEMC_DQS */
+                       >;
                         u-boot,dm-spl;
                 };
         };
   };
 
Quoted 3 lines

arch/arm/dts/imxrt1050-evk-u-boot.dtsi line 203

Quoted 1 line
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +1 -0
+&pinctrl_lpuart1 {

Add diff:
        compatible = "fsl,imxrt-lpuart";

You probably meant that to go under the lpuart1 node but I got your point.

Quoted 6 lines

arch/arm/dts/imxrt1050-evk-u-boot.dtsi line 207

Quoted 4 lines
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +4 -0
+       u-boot,dm-spl;
+};
+
+&pinctrl_usdhc0 {

Add diff:
        compatible = "fsl,imxrt-usdhc";

Quoted 6 lines

And this under the usdhc1 one.

Quoted 2 lines

I tested this
https://github.com/Mr-Bossman/u-boot/commit/42a7f430d761bb4d44f646a27649deda15352f2e

That commit seems totally different from any of this series. Not sure.

It's this patch with the changes nessasary to make it boot added on top.
Please sqash them into this patch and take notes as to the diff.
Everything that was removed by the syncing should be added into the -u-boot.dts So pinctl for SMEC and SMEC timing need to be moved as well as compatibles.

Thanks,
Jesse

Quoted 614 lines
Quoted 5 lines

Some note for future, check if the compatibles are the same they arent here so the soc.dtsi will be broken. Also wait a bit for other people to resopnd to patches before sending out v2 because no one commented on the other patches yet.

Sure, sure.

Cheers

Marcel

Quoted 602 lines

Thanks,
Jesse

Quoted 600 lines
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +3 -0
+       u-boot,dm-spl;
+};
+
   &usdhc1 {
         u-boot,dm-spl;
   };
arch/arm/dts/imxrt1050-evk.dts +31 -226
index fb2da3adfcf..6a9c10decf5 100644
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
   /*
    * Copyright (C) 2019
    * Author(s): Giulio Benetti <[email protected]>
@@ -6,7 +6,6 @@
 
   /dts-v1/;
   #include "imxrt1050.dtsi"
-#include "imxrt1050-evk-u-boot.dtsi"
   #include "imxrt1050-pinfunc.h"
 
   / {
@@ -14,210 +13,52 @@
         compatible = "fsl,imxrt1050-evk", "fsl,imxrt1050";
 
         chosen {
-               bootargs = "root=/dev/ram";
-               stdout-path = "serial0:115200n8";
-               tick-timer = &gpt1;
+               stdout-path = &lpuart1;
         };
 
-       memory {
+       aliases {
+               gpio0 = &gpio1;
+               gpio1 = &gpio2;
+               gpio2 = &gpio3;
+               gpio3 = &gpio4;
+               gpio4 = &gpio5;
+               mmc0 = &usdhc1;
+               serial0 = &lpuart1;
+       };
+
+       memory@80000000 {
                 device_type = "memory";
                 reg = <0x80000000 0x2000000>;
         };
   };
 
-&lpuart1 { /* console */
+&lpuart1 {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_lpuart1>;
         status = "okay";
   };
 
-&semc {
-       /*
-        * Memory configuration from sdram datasheet IS42S16160J-6BLI
-        */
-       fsl,sdram-mux = /bits/ 8 <MUX_A8_SDRAM_A8
-                               MUX_CSX0_SDRAM_CS1
-                               0
-                               0
-                               0
-                               0>;
-       fsl,sdram-control = /bits/ 8 <MEM_WIDTH_16BITS
-                                       BL_8
-                                       COL_9BITS
-                                       CL_3>;
-       fsl,sdram-timing = /bits/ 8 <0x2
-                                    0x2
-                                    0x9
-                                    0x1
-                                    0x5
-                                    0x6
-
-                                    0x20
-                                    0x09
-                                    0x01
-                                    0x00
-
-                                    0x04
-                                    0x0A
-                                    0x21
-                                    0x50>;
-
-       bank1: bank@0 {
-               fsl,base-address = <0x80000000>;
-               fsl,memory-size = <MEM_SIZE_32M>;
-       };
-};
-
   &iomuxc {
         pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_lpuart1>;
-
-       imxrt1050-evk {
-               pinctrl_lpuart1: lpuart1grp {
-                       fsl,pins = <
-                               MXRT1050_IOMUXC_GPIO_AD_B0_12_LPUART1_TXD
-                                       0xf1
-                               MXRT1050_IOMUXC_GPIO_AD_B0_13_LPUART1_RXD
-                                       0xf1
-                       >;
-               };
-
-               pinctrl_semc: semcgrp {
-                       fsl,pins = <
-                               MXRT1050_IOMUXC_GPIO_EMC_00_SEMC_DA00
-                                       0xf1    /* SEMC_D0 */
-                               MXRT1050_IOMUXC_GPIO_EMC_01_SEMC_DA01
-                                       0xf1    /* SEMC_D1 */
-                               MXRT1050_IOMUXC_GPIO_EMC_02_SEMC_DA02
-                                       0xf1    /* SEMC_D2 */
-                               MXRT1050_IOMUXC_GPIO_EMC_03_SEMC_DA03
-                                       0xf1    /* SEMC_D3 */
-                               MXRT1050_IOMUXC_GPIO_EMC_04_SEMC_DA04
-                                       0xf1    /* SEMC_D4 */
-                               MXRT1050_IOMUXC_GPIO_EMC_05_SEMC_DA05
-                                       0xf1    /* SEMC_D5 */
-                               MXRT1050_IOMUXC_GPIO_EMC_06_SEMC_DA06
-                                       0xf1    /* SEMC_D6 */
-                               MXRT1050_IOMUXC_GPIO_EMC_07_SEMC_DA07
-                                       0xf1    /* SEMC_D7 */
-                               MXRT1050_IOMUXC_GPIO_EMC_08_SEMC_DM00
-                                       0xf1    /* SEMC_DM0 */
-                               MXRT1050_IOMUXC_GPIO_EMC_09_SEMC_ADDR00
-                                       0xf1    /* SEMC_A0 */
-                               MXRT1050_IOMUXC_GPIO_EMC_10_SEMC_ADDR01
-                                       0xf1    /* SEMC_A1 */
-                               MXRT1050_IOMUXC_GPIO_EMC_11_SEMC_ADDR02
-                                       0xf1    /* SEMC_A2 */
-                               MXRT1050_IOMUXC_GPIO_EMC_12_SEMC_ADDR03
-                                       0xf1    /* SEMC_A3 */
-                               MXRT1050_IOMUXC_GPIO_EMC_13_SEMC_ADDR04
-                                       0xf1    /* SEMC_A4 */
-                               MXRT1050_IOMUXC_GPIO_EMC_14_SEMC_ADDR05
-                                       0xf1    /* SEMC_A5 */
-                               MXRT1050_IOMUXC_GPIO_EMC_15_SEMC_ADDR06
-                                       0xf1    /* SEMC_A6 */
-                               MXRT1050_IOMUXC_GPIO_EMC_16_SEMC_ADDR07
-                                       0xf1    /* SEMC_A7 */
-                               MXRT1050_IOMUXC_GPIO_EMC_17_SEMC_ADDR08
-                                       0xf1    /* SEMC_A8 */
-                               MXRT1050_IOMUXC_GPIO_EMC_18_SEMC_ADDR09
-                                       0xf1    /* SEMC_A9 */
-                               MXRT1050_IOMUXC_GPIO_EMC_19_SEMC_ADDR11
-                                       0xf1    /* SEMC_A11 */
-                               MXRT1050_IOMUXC_GPIO_EMC_20_SEMC_ADDR12
-                                       0xf1    /* SEMC_A12 */
-                               MXRT1050_IOMUXC_GPIO_EMC_21_SEMC_BA0
-                                       0xf1    /* SEMC_BA0 */
-                               MXRT1050_IOMUXC_GPIO_EMC_22_SEMC_BA1
-                                       0xf1    /* SEMC_BA1 */
-                               MXRT1050_IOMUXC_GPIO_EMC_23_SEMC_ADDR10
-                                       0xf1    /* SEMC_A10 */
-                               MXRT1050_IOMUXC_GPIO_EMC_24_SEMC_CAS
-                                       0xf1    /* SEMC_CAS */
-                               MXRT1050_IOMUXC_GPIO_EMC_25_SEMC_RAS
-                                       0xf1    /* SEMC_RAS */
-                               MXRT1050_IOMUXC_GPIO_EMC_26_SEMC_CLK
-                                       0xf1    /* SEMC_CLK */
-                               MXRT1050_IOMUXC_GPIO_EMC_27_SEMC_CKE
-                                       0xf1    /* SEMC_CKE */
-                               MXRT1050_IOMUXC_GPIO_EMC_28_SEMC_WE
-                                       0xf1    /* SEMC_WE */
-                               MXRT1050_IOMUXC_GPIO_EMC_29_SEMC_CS0
-                                       0xf1    /* SEMC_CS0 */
-                               MXRT1050_IOMUXC_GPIO_EMC_30_SEMC_DA08
-                                       0xf1    /* SEMC_D8 */
-                               MXRT1050_IOMUXC_GPIO_EMC_31_SEMC_DA09
-                                       0xf1    /* SEMC_D9 */
-                               MXRT1050_IOMUXC_GPIO_EMC_32_SEMC_DA10
-                                       0xf1    /* SEMC_D10 */
-                               MXRT1050_IOMUXC_GPIO_EMC_33_SEMC_DA11
-                                       0xf1    /* SEMC_D11 */
-                               MXRT1050_IOMUXC_GPIO_EMC_34_SEMC_DA12
-                                       0xf1    /* SEMC_D12 */
-                               MXRT1050_IOMUXC_GPIO_EMC_35_SEMC_DA13
-                                       0xf1    /* SEMC_D13 */
-                               MXRT1050_IOMUXC_GPIO_EMC_36_SEMC_DA14
-                                       0xf1    /* SEMC_D14 */
-                               MXRT1050_IOMUXC_GPIO_EMC_37_SEMC_DA15
-                                       0xf1    /* SEMC_D15 */
-                               MXRT1050_IOMUXC_GPIO_EMC_38_SEMC_DM01
-                                       0xf1    /* SEMC_DM1 */
-                               MXRT1050_IOMUXC_GPIO_EMC_39_SEMC_DQS
-                                       (IMX_PAD_SION | 0xf1)   /* SEMC_DQS */
-                       >;
-               };
-
-               pinctrl_usdhc0: usdhc0grp {
-                       fsl,pins = <
-                               MXRT1050_IOMUXC_GPIO_B1_12_USDHC1_CD_B
-                                       0x1B000
-                               MXRT1050_IOMUXC_GPIO_B1_14_USDHC1_VSELECT
-                                       0xB069
-                               MXRT1050_IOMUXC_GPIO_SD_B0_00_USDHC1_CMD
-                                       0x17061
-                               MXRT1050_IOMUXC_GPIO_SD_B0_01_USDHC1_CLK
-                                       0x17061
-                               MXRT1050_IOMUXC_GPIO_SD_B0_05_USDHC1_DATA3
-                                       0x17061
-                               MXRT1050_IOMUXC_GPIO_SD_B0_04_USDHC1_DATA2
-                                       0x17061
-                               MXRT1050_IOMUXC_GPIO_SD_B0_03_USDHC1_DATA1
-                                       0x17061
-                               MXRT1050_IOMUXC_GPIO_SD_B0_02_USDHC1_DATA0
-                                       0x17061
-                       >;
-               };
-
-               pinctrl_lcdif: lcdifgrp {
-                       fsl,pins = <
-                               MXRT1050_IOMUXC_GPIO_B0_00_LCD_CLK              0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_01_LCD_ENABLE           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_02_LCD_HSYNC            0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_03_LCD_VSYNC            0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_04_LCD_DATA00           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_05_LCD_DATA01           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_06_LCD_DATA02           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_07_LCD_DATA03           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_08_LCD_DATA04           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_09_LCD_DATA05           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_10_LCD_DATA06           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_11_LCD_DATA07           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_12_LCD_DATA08           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_13_LCD_DATA09           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_14_LCD_DATA10           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B0_15_LCD_DATA11           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B1_01_LCD_DATA13           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B1_02_LCD_DATA14           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B1_03_LCD_DATA15           0x1b0b1
-                               MXRT1050_IOMUXC_GPIO_B1_15_GPIO2_IO31           0x0b069
-                               MXRT1050_IOMUXC_GPIO_AD_B0_02_GPIO1_IO02        0x0b069
-                       >;
-               };
+       pinctrl_lpuart1: lpuart1grp {
+               fsl,pins = <
+                       MXRT1050_IOMUXC_GPIO_AD_B0_12_LPUART1_TXD       0xf1
+                       MXRT1050_IOMUXC_GPIO_AD_B0_13_LPUART1_RXD       0xf1
+               >;
         };
-};
 
-&gpt1 {
-       status = "okay";
+       pinctrl_usdhc0: usdhc0grp {
+               fsl,pins = <
+                       MXRT1050_IOMUXC_GPIO_B1_12_USDHC1_CD_B          0x1B000
+                       MXRT1050_IOMUXC_GPIO_B1_14_USDHC1_VSELECT       0xB069
+                       MXRT1050_IOMUXC_GPIO_SD_B0_00_USDHC1_CMD        0x17061
+                       MXRT1050_IOMUXC_GPIO_SD_B0_01_USDHC1_CLK        0x17061
+                       MXRT1050_IOMUXC_GPIO_SD_B0_05_USDHC1_DATA3      0x17061
+                       MXRT1050_IOMUXC_GPIO_SD_B0_04_USDHC1_DATA2      0x17061
+                       MXRT1050_IOMUXC_GPIO_SD_B0_03_USDHC1_DATA1      0x17061
+                       MXRT1050_IOMUXC_GPIO_SD_B0_02_USDHC1_DATA0      0x17061
+               >;
+       };
   };
 
   &usdhc1 {
@@ -226,42 +67,6 @@
         pinctrl-1 = <&pinctrl_usdhc0>;
         pinctrl-2 = <&pinctrl_usdhc0>;
         pinctrl-3 = <&pinctrl_usdhc0>;
-       status = "okay";
-
         cd-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;
-};
-
-&lcdif {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_lcdif>;
-       display = <&display0>;
-       status = "okay";
-
-       display0: display0 {
-               bits-per-pixel = <16>;
-               bus-width = <16>;
-
-               display-timings {
-                       timing0: timing0 {
-                               clock-frequency = <9300000>;
-                               hactive = <480>;
-                               vactive = <272>;
-                               hback-porch = <4>;
-                               hfront-porch = <8>;
-                               vback-porch = <4>;
-                               vfront-porch = <8>;
-                               hsync-len = <41>;
-                               vsync-len = <10>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                       };
-               };
-       };
-};
-
-&usbotg1 {
-       dr_mode = "host";
         status = "okay";
   };
arch/arm/dts/imxrt1050-pinfunc.h +1 -1
index a29031ab3de..22c14a3262a 100644
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
   /*
    * Copyright (C) 2019
    * Author(s): Giulio Benetti <[email protected]>
arch/arm/dts/imxrt1050.dtsi +70 -98
index 09f4712af68..03e6a858a7b 100644
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
   /*
    * Copyright (C) 2019
    * Author(s): Giulio Benetti <[email protected]>
@@ -8,53 +8,37 @@
   #include <dt-bindings/interrupt-controller/arm-gic.h>
   #include <dt-bindings/clock/imxrt1050-clock.h>
   #include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/memory/imxrt-sdram.h>
 
   / {
         #address-cells = <1>;
         #size-cells = <1>;
 
-       aliases {
-               display0 = &lcdif;
-               gpio0 = &gpio1;
-               gpio1 = &gpio2;
-               gpio2 = &gpio3;
-               gpio3 = &gpio4;
-               gpio4 = &gpio5;
-               mmc0 = &usdhc1;
-               serial0 = &lpuart1;
-               usbphy0 = &usbphy1;
-       };
-
         clocks {
                 osc: osc {
-                       compatible = "fsl,imx-osc", "fixed-clock";
+                       compatible = "fixed-clock";
                         #clock-cells = <0>;
                         clock-frequency = <24000000>;
                 };
-       };
 
-       soc {
-               semc: semc@402f0000 {
-                       compatible = "fsl,imxrt-semc";
-                       reg = <0x402f0000 0x4000>;
-                       clocks = <&clks IMXRT1050_CLK_SEMC>;
-                       pinctrl-0 = <&pinctrl_semc>;
-                       pinctrl-names = "default";
-                       status = "okay";
+               osc3M: osc3M {
+                       compatible = "fixed-clock";
+                       #clock-cells = <0>;
+                       clock-frequency = <3000000>;
                 };
+       };
 
+       soc {
                 lpuart1: serial@40184000 {
-                       compatible = "fsl,imxrt-lpuart";
+                       compatible = "fsl,imxrt1050-lpuart", "fsl,imx7ulp-lpuart";
                         reg = <0x40184000 0x4000>;
-                       interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <20>;
                         clocks = <&clks IMXRT1050_CLK_LPUART1>;
-                       clock-names = "per";
+                       clock-names = "ipg";
                         status = "disabled";
                 };
 
-               iomuxc: iomuxc@401f8000 {
-                       compatible = "fsl,imxrt-iomuxc";
+               iomuxc: pinctrl@401f8000 {
+                       compatible = "fsl,imxrt1050-iomuxc";
                         reg = <0x401f8000 0x4000>;
                         fsl,mux_mask = <0x7>;
                 };
@@ -64,31 +48,61 @@
                         reg = <0x400d8000 0x4000>;
                 };
 
-               clks: ccm@400fc000 {
+               clks: clock-controller@400fc000 {
                         compatible = "fsl,imxrt1050-ccm";
                         reg = <0x400fc000 0x4000>;
-                       interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <95>, <96>;
+                       clocks = <&osc>;
+                       clock-names = "osc";
                         #clock-cells = <1>;
-               };
-
-               usdhc1: usdhc@402c0000 {
-                       compatible = "fsl,imxrt-usdhc";
-                       reg = <0x402c0000 0x10000>;
-                       interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&clks IMXRT1050_CLK_USDHC1>;
-                       clock-names = "per";
+                       assigned-clocks = <&clks IMXRT1050_CLK_PLL1_BYPASS>,
+                               <&clks IMXRT1050_CLK_PLL1_BYPASS>,
+                               <&clks IMXRT1050_CLK_PLL2_BYPASS>,
+                               <&clks IMXRT1050_CLK_PLL3_BYPASS>,
+                               <&clks IMXRT1050_CLK_PLL3_PFD1_664_62M>,
+                               <&clks IMXRT1050_CLK_PLL2_PFD2_396M>;
+                       assigned-clock-parents = <&clks IMXRT1050_CLK_PLL1_REF_SEL>,
+                               <&clks IMXRT1050_CLK_PLL1_ARM>,
+                               <&clks IMXRT1050_CLK_PLL2_SYS>,
+                               <&clks IMXRT1050_CLK_PLL3_USB_OTG>,
+                               <&clks IMXRT1050_CLK_PLL3_USB_OTG>,
+                               <&clks IMXRT1050_CLK_PLL2_SYS>;
+               };
+
+               edma1: dma-controller@400e8000 {
+                       #dma-cells = <2>;
+                       compatible = "fsl,imx7ulp-edma";
+                       reg = <0x400e8000 0x4000>,
+                               <0x400ec000 0x4000>;
+                       dma-channels = <32>;
+                       interrupts = <0>, <1>, <2>, <3>, <4>, <5>, <6>, <7>, <8>,
+                               <9>, <10>, <11>, <12>, <13>, <14>, <15>, <16>;
+                       clock-names = "dma", "dmamux0";
+                       clocks = <&clks IMXRT1050_CLK_DMA>,
+                                <&clks IMXRT1050_CLK_DMA_MUX>;
+               };
+
+               usdhc1: mmc@402c0000 {
+                       compatible = "fsl,imxrt1050-usdhc", "fsl,imx6sl-usdhc";
+                       reg = <0x402c0000 0x4000>;
+                       interrupts = <110>;
+                       clocks = <&clks IMXRT1050_CLK_IPG_PDOF>,
+                               <&clks IMXRT1050_CLK_OSC>,
+                               <&clks IMXRT1050_CLK_USDHC1>;
+                       clock-names = "ipg", "ahb", "per";
                         bus-width = <4>;
+                       fsl,wp-controller;
+                       no-1-8-v;
+                       max-frequency = <4000000>;
                         fsl,tuning-start-tap = <20>;
-                       fsl,tuning-step= <2>;
+                       fsl,tuning-step = <2>;
                         status = "disabled";
                 };
 
                 gpio1: gpio@401b8000 {
-                       compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio";
+                       compatible = "fsl,imxrt1050-gpio", "fsl,imx35-gpio";
                         reg = <0x401b8000 0x4000>;
-                       interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <80>, <81>;
                         gpio-controller;
                         #gpio-cells = <2>;
                         interrupt-controller;
@@ -96,10 +110,9 @@
                 };
 
                 gpio2: gpio@401bc000 {
-                       compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio";
+                       compatible = "fsl,imxrt1050-gpio", "fsl,imx35-gpio";
                         reg = <0x401bc000 0x4000>;
-                       interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>,
-                               <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <82>, <83>;
                         gpio-controller;
                         #gpio-cells = <2>;
                         interrupt-controller;
@@ -107,10 +120,9 @@
                 };
 
                 gpio3: gpio@401c0000 {
-                       compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio";
+                       compatible = "fsl,imxrt1050-gpio", "fsl,imx35-gpio";
                         reg = <0x401c0000 0x4000>;
-                       interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>,
-                               <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <84>, <85>;
                         gpio-controller;
                         #gpio-cells = <2>;
                         interrupt-controller;
@@ -118,10 +130,9 @@
                 };
 
                 gpio4: gpio@401c4000 {
-                       compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio";
+                       compatible = "fsl,imxrt1050-gpio", "fsl,imx35-gpio";
                         reg = <0x401c4000 0x4000>;
-                       interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <86>, <87>;
                         gpio-controller;
                         #gpio-cells = <2>;
                         interrupt-controller;
@@ -129,60 +140,21 @@
                 };
 
                 gpio5: gpio@400c0000 {
-                       compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio";
+                       compatible = "fsl,imxrt1050-gpio", "fsl,imx35-gpio";
                         reg = <0x400c0000 0x4000>;
-                       interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>,
-                               <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <88>, <89>;
                         gpio-controller;
                         #gpio-cells = <2>;
                         interrupt-controller;
                         #interrupt-cells = <2>;
                 };
 
-               lcdif: lcdif@402b8000 {
-                       compatible = "fsl,imxrt-lcdif";
-                       reg = <0x402b8000 0x4000>;
-                       interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&clks IMXRT1050_CLK_LCDIF_PIX>,
-                                <&clks IMXRT1050_CLK_LCDIF_APB>;
-                       clock-names = "pix", "axi";
-                       assigned-clocks = <&clks IMXRT1050_CLK_LCDIF_SEL>;
-                       assigned-clock-parents = <&clks IMXRT1050_CLK_PLL5_VIDEO>;
-                       status = "disabled";
-               };
-
-               gpt1: gpt1@401ec000 {
-                       compatible = "fsl,imxrt-gpt";
+               gpt: timer@401ec000 {
+                       compatible = "fsl,imxrt1050-gpt", "fsl,imx6dl-gpt", "fsl,imx6sl-gpt";
                         reg = <0x401ec000 0x4000>;
                         interrupts = <100>;
-                       clocks = <&osc>;
-                       status = "disabled";
-               };
-
-               usbphy1: usbphy@400d9000 {
-                       compatible = "fsl,imxrt-usbphy";
-                       reg = <0x400d9000 0x1000>;
-                       interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
-               };
-
-               usbmisc: usbmisc@402e0800 {
-                       #index-cells = <1>;
-                       compatible = "fsl,imxrt-usbmisc";
-                       reg = <0x402e0800 0x200>;
-                       clocks = <&clks IMXRT1050_CLK_USBOH3>;
-               };
-
-               usbotg1: usb@402e0000 {
-                       compatible = "fsl,imxrt-usb", "fsl,imx27-usb";
-                       reg = <0x402e0000 0x200>;
-                       interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&clks IMXRT1050_CLK_USBOH3>;
-                       fsl,usbphy = <&usbphy1>;
-                       fsl,usbmisc = <&usbmisc 0>;
-                       ahb-burst-config = <0x0>;
-                       tx-burst-size-dword = <0x10>;
-                       rx-burst-size-dword = <0x10>;
-                       status = "disabled";
+                       clocks = <&osc3M>;
+                       clock-names = "per";
                 };
         };
   };
include/dt-bindings/clock/imxrt1050-clock.h +7 -2
index f74dbbcf937..93bef0832d1 100644
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
   /*
    * Copyright(C) 2019
    * Author(s): Giulio Benetti <[email protected]>
@@ -62,6 +62,11 @@
   #define IMXRT1050_CLK_PLL7_USB_HOST           53
   #define IMXRT1050_CLK_LCDIF_PIX                       54
   #define IMXRT1050_CLK_USBOH3                  55
-#define IMXRT1050_CLK_END                      56
+#define IMXRT1050_CLK_IPG_PDOF                 56
+#define IMXRT1050_CLK_PER_CLK_SEL              57
+#define IMXRT1050_CLK_PER_PDOF                 58
+#define IMXRT1050_CLK_DMA                      59
+#define IMXRT1050_CLK_DMA_MUX                  60
+#define IMXRT1050_CLK_END                      61
 
   #endif /* __DT_BINDINGS_CLOCK_IMXRT1050_H */
#7 lore raw

PATCH v2 4/8 imx8ulp: synchronise device tree with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v6.0-rc1.

---

Changes in v2:
- imx8ulp: Re-added s400_mu device tree node.

 arch/arm/dts/imx8ulp-evk-u-boot.dtsi          |  15 +-
 arch/arm/dts/imx8ulp-evk.dts                  | 191 +-----
 arch/arm/dts/imx8ulp-pinfunc.h                |   4 +-
 arch/arm/dts/imx8ulp.dtsi                     | 564 +++++-------------
 include/dt-bindings/clock/imx8ulp-clock.h     |  49 +-
 include/dt-bindings/power/imx8ulp-power.h     |  26 +
 include/dt-bindings/reset/imx8ulp-pcc-reset.h |  59 ++
 7 files changed, 278 insertions(+), 630 deletions(-)
 create mode 100644 include/dt-bindings/power/imx8ulp-power.h
 create mode 100644 include/dt-bindings/reset/imx8ulp-pcc-reset.h
arch/arm/dts/imx8ulp-evk-u-boot.dtsi +10 -5
index 7c1dab2acfc..ad264f271ec 100644
@@ -3,7 +3,16 @@
  * Copyright 2021 NXP
  */
 
-&{/soc@0} {
+/ {
+	mu@27020000 {
+		compatible = "fsl,imx8ulp-mu";
+		reg = <0 0x27020000 0 0x10000>;
+		status = "okay";
+		u-boot,dm-spl;
+	};
+};
+
+&soc {
 	u-boot,dm-spl;
 };
 
@@ -23,10 +32,6 @@
 	u-boot,dm-spl;
 };
 
-&s400_mu {
-	u-boot,dm-spl;
-};
-
 &lpuart5 {
 	u-boot,dm-spl;
 };
arch/arm/dts/imx8ulp-evk.dts +16 -175

224 lines not on this page · raw message

arch/arm/dts/imx8ulp-pinfunc.h +2 -2
index c21c3b644e5..b204ac79b44 100644
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: GPL-2.0+ OR MIT */
 /*
- * Copyright 2020 NXP
+ * Copyright 2021 NXP
  */
 
 #ifndef __DTS_IMX8ULP_PINFUNC_H
arch/arm/dts/imx8ulp.dtsi +135 -429

742 lines not on this page · raw message

include/dt-bindings/clock/imx8ulp-clock.h +30 -19

108 lines not on this page · raw message

include/dt-bindings/power/imx8ulp-power.h new file +26 -0
new file mode 100644
index 00000000000..a556b2e96df
@@ -0,0 +1,26 @@
+/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */
+/*
+ *  Copyright 2021 NXP
+ */
+
+#ifndef __DT_BINDINGS_IMX8ULP_POWER_H__
+#define __DT_BINDINGS_IMX8ULP_POWER_H__
+
+#define IMX8ULP_PD_DMA1		0
+#define IMX8ULP_PD_FLEXSPI2	1
+#define IMX8ULP_PD_USB0		2
+#define IMX8ULP_PD_USDHC0	3
+#define IMX8ULP_PD_USDHC1	4
+#define IMX8ULP_PD_USDHC2_USB1	5
+#define IMX8ULP_PD_DCNANO	6
+#define IMX8ULP_PD_EPDC		7
+#define IMX8ULP_PD_DMA2		8
+#define IMX8ULP_PD_GPU2D	9
+#define IMX8ULP_PD_GPU3D	10
+#define IMX8ULP_PD_HIFI4	11
+#define IMX8ULP_PD_ISI		12
+#define IMX8ULP_PD_MIPI_CSI	13
+#define IMX8ULP_PD_MIPI_DSI	14
+#define IMX8ULP_PD_PXP		15
+
+#endif
include/dt-bindings/reset/imx8ulp-pcc-reset.h new file +59 -0

59 lines not on this page · raw message

Signature · 1 line
2.35.1
#8 lore raw

PATCH v2 5/8 imx8mq: synchronise device tree with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v6.0-rc1.

---

(no changes since v1)

 arch/arm/dts/imx8mq-evk.dts              | 43 +++++++++++++++++
 arch/arm/dts/imx8mq-u-boot.dtsi          | 10 ++--
 arch/arm/dts/imx8mq.dtsi                 | 15 +++---
 include/dt-bindings/reset/imx8mq-reset.h | 61 +++++++++++++-----------
 4 files changed, 88 insertions(+), 41 deletions(-)
arch/arm/dts/imx8mq-evk.dts +43 -0
index 99fed35168e..82387b9cb80 100644
@@ -71,12 +71,36 @@
 		linux,autosuspend-period = <125>;
 	};
 
+	audio_codec_bt_sco: audio-codec-bt-sco {
+		compatible = "linux,bt-sco";
+		#sound-dai-cells = <1>;
+	};
+
 	wm8524: audio-codec {
 		#sound-dai-cells = <0>;
 		compatible = "wlf,wm8524";
 		wlf,mute-gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
 	};
 
+	sound-bt-sco {
+		compatible = "simple-audio-card";
+		simple-audio-card,name = "bt-sco-audio";
+		simple-audio-card,format = "dsp_a";
+		simple-audio-card,bitclock-inversion;
+		simple-audio-card,frame-master = <&btcpu>;
+		simple-audio-card,bitclock-master = <&btcpu>;
+
+		btcpu: simple-audio-card,cpu {
+			sound-dai = <&sai3>;
+			dai-tdm-slot-num = <2>;
+			dai-tdm-slot-width = <16>;
+		};
+
+		simple-audio-card,codec {
+			sound-dai = <&audio_codec_bt_sco 1>;
+		};
+	};
+
 	sound-wm8524 {
 		compatible = "simple-audio-card";
 		simple-audio-card,name = "wm8524-audio";
@@ -386,6 +410,16 @@
 	status = "okay";
 };
 
+&sai3 {
+	#sound-dai-cells = <0>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_sai3>;
+	assigned-clocks = <&clk IMX8MQ_CLK_SAI3>;
+	assigned-clock-parents = <&clk IMX8MQ_AUDIO_PLL1_OUT>;
+	assigned-clock-rates = <24576000>;
+	status = "okay";
+};
+
 &snvs_pwrkey {
 	status = "okay";
 };
@@ -548,6 +582,15 @@
 		>;
 	};
 
+	pinctrl_sai3: sai3grp {
+		fsl,pins = <
+			MX8MQ_IOMUXC_SAI3_TXFS_SAI3_TX_SYNC     0xd6
+			MX8MQ_IOMUXC_SAI3_TXC_SAI3_TX_BCLK      0xd6
+			MX8MQ_IOMUXC_SAI3_TXD_SAI3_TX_DATA0     0xd6
+			MX8MQ_IOMUXC_SAI3_RXD_SAI3_RX_DATA0     0xd6
+		>;
+	};
+
 	pinctrl_spdif1: spdif1grp {
 		fsl,pins = <
 			MX8MQ_IOMUXC_SPDIF_TX_SPDIF1_OUT	0xd6
arch/arm/dts/imx8mq-u-boot.dtsi +5 -5
index e8b5f83706e..e6448ab8ad3 100644
@@ -10,23 +10,23 @@
 
 };
 
-&{/soc@0} {
+&soc {
 	u-boot,dm-spl;
 };
 
-&{/soc@0/bus@30000000} {
+&aips1 {
 	u-boot,dm-spl;
 };
 
-&{/soc@0/bus@30400000} {
+&aips2 {
 	u-boot,dm-spl;
 };
 
-&{/soc@0/bus@30800000} {
+&aips3 {
 	u-boot,dm-spl;
 };
 
-&{/soc@0/bus@32c00000} {
+&aips4 {
 	u-boot,dm-spl;
 };
 
arch/arm/dts/imx8mq.dtsi +8 -7
index 49eadb081b1..e9f0cdd10ab 100644
@@ -94,7 +94,7 @@
 	clk_ext4: clock-ext4 {
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
-		clock-frequency= <133000000>;
+		clock-frequency = <133000000>;
 		clock-output-names = "clk_ext4";
 	};
 
@@ -320,7 +320,7 @@
 		arm,no-tick-in-suspend;
 	};
 
-	soc@0 {
+	soc: soc@0 {
 		compatible = "fsl,imx8mq-soc", "simple-bus";
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -329,7 +329,7 @@
 		nvmem-cells = <&imx8mq_uid>;
 		nvmem-cell-names = "soc_unique_id";
 
-		bus@30000000 { /* AIPS1 */
+		aips1: bus@30000000 { /* AIPS1 */
 			compatible = "fsl,aips-bus", "simple-bus";
 			reg = <0x30000000 0x400000>;
 			#address-cells = <1>;
@@ -507,7 +507,7 @@
 						      <0x00030005 0x00000053>,
 						      <0x00030006 0x0000005f>,
 						      <0x00030007 0x00000071>;
-				#thermal-sensor-cells =  <1>;
+				#thermal-sensor-cells = <1>;
 			};
 
 			wdog1: watchdog@30280000 {
@@ -784,7 +784,7 @@
 			};
 		};
 
-		bus@30400000 { /* AIPS2 */
+		aips2: bus@30400000 { /* AIPS2 */
 			compatible = "fsl,aips-bus", "simple-bus";
 			reg = <0x30400000 0x400000>;
 			#address-cells = <1>;
@@ -844,7 +844,7 @@
 			};
 		};
 
-		bus@30800000 { /* AIPS3 */
+		aips3: bus@30800000 { /* AIPS3 */
 			compatible = "fsl,aips-bus", "simple-bus";
 			reg = <0x30800000 0x400000>;
 			#address-cells = <1>;
@@ -1018,6 +1018,7 @@
 					compatible = "fsl,sec-v4.0-job-ring";
 					reg = <0x1000 0x1000>;
 					interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
+					status = "disabled";
 				};
 
 				sec_jr1: jr@2000 {
@@ -1369,7 +1370,7 @@
 			};
 		};
 
-		bus@32c00000 { /* AIPS4 */
+		aips4: bus@32c00000 { /* AIPS4 */
 			compatible = "fsl,aips-bus", "simple-bus";
 			reg = <0x32c00000 0x400000>;
 			#address-cells = <1>;
include/dt-bindings/reset/imx8mq-reset.h +32 -29

69 lines not on this page · raw message

Signature · 1 line
2.35.1
#9 lore raw

PATCH v2 6/8 imx8mp: synchronise device tree with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v6.0-rc1.

---

(no changes since v1)

 arch/arm/dts/imx8mp-dhcom-pdk2.dts          |  27 +++--
 arch/arm/dts/imx8mp-dhcom-som.dtsi          |  20 +---
 arch/arm/dts/imx8mp-evk.dts                 | 126 +++++++++++---------
 arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts |  48 ++++----
 arch/arm/dts/imx8mp-u-boot.dtsi             |   2 +-
 arch/arm/dts/imx8mp-venice-gw74xx.dts       | 116 +++++++++---------
 arch/arm/dts/imx8mp-verdin.dtsi             |  14 ++-
 arch/arm/dts/imx8mp.dtsi                    |  33 ++++-
 include/dt-bindings/clock/imx8mp-clock.h    |  13 +-
 include/dt-bindings/power/imx8mp-power.h    |  15 ++-
 include/dt-bindings/reset/imx8mp-reset.h    |  50 ++++++++
 11 files changed, 284 insertions(+), 180 deletions(-)
 create mode 100644 include/dt-bindings/reset/imx8mp-reset.h
arch/arm/dts/imx8mp-dhcom-pdk2.dts +19 -8
index e95abfb3e89..2ca2ede2e94 100644
@@ -19,7 +19,6 @@
 	};
 
 	gpio-keys {
-		#size-cells = <0>;
 		compatible = "gpio-keys";
 
 		button-0 {
@@ -62,7 +61,7 @@
 	led {
 		compatible = "gpio-leds";
 
-		led-5 {
+		led-0 {
 			color = <LED_COLOR_ID_GREEN>;
 			default-state = "off";
 			function = LED_FUNCTION_INDICATOR;
@@ -71,7 +70,7 @@
 			pinctrl-names = "default";
 		};
 
-		led-6 {
+		led-1 {
 			color = <LED_COLOR_ID_GREEN>;
 			default-state = "off";
 			function = LED_FUNCTION_INDICATOR;
@@ -80,7 +79,7 @@
 			pinctrl-names = "default";
 		};
 
-		led-7 {
+		led-2 {
 			color = <LED_COLOR_ID_GREEN>;
 			default-state = "off";
 			function = LED_FUNCTION_INDICATOR;
@@ -89,7 +88,7 @@
 			pinctrl-names = "default";
 		};
 
-		led-8 {
+		led-3 {
 			color = <LED_COLOR_ID_GREEN>;
 			default-state = "off";
 			function = LED_FUNCTION_INDICATOR;
@@ -118,10 +117,11 @@
 	mdio {
 		ethphypdk: ethernet-phy@7 { /* KSZ 9021 */
 			compatible = "ethernet-phy-ieee802.3-c22";
-			interrupt-parent = <&gpio4>;
-			interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
 			pinctrl-0 = <&pinctrl_ethphy1>;
 			pinctrl-names = "default";
+			interrupt-parent = <&gpio4>;
+			interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
+			max-speed = <100>;
 			reg = <7>;
 			reset-assert-us = <1000>;
 			reset-deassert-us = <1000>;
@@ -138,7 +138,6 @@
 			txd2-skew-ps = <0>;
 			txd3-skew-ps = <0>;
 			txen-skew-ps = <0>;
-			max-speed = <100>;
 		};
 	};
 };
@@ -150,3 +149,15 @@
 &usb3_1 {
 	fsl,over-current-active-low;
 };
+
+&iomuxc {
+	/*
+	 * GPIO_A,B,C,D are connected to buttons.
+	 * GPIO_E,F,H,I are connected to LEDs.
+	 * GPIO_M is connected to CLKOUT2.
+	 */
+	pinctrl-0 = <&pinctrl_hog_base
+		     &pinctrl_dhcom_g &pinctrl_dhcom_j
+		     &pinctrl_dhcom_k &pinctrl_dhcom_l
+		     &pinctrl_dhcom_int>;
+};
arch/arm/dts/imx8mp-dhcom-som.dtsi +4 -16
index 63cc6c92c41..a616eb37800 100644
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2021-2022 Marek Vasut <[email protected]>
  */
@@ -224,10 +224,6 @@
 };
 
 &i2c3 {
-	/*
-	 * iMX8MP 1P33A Errata ERR007805
-	 * I2C is limited to 384 kHz due to SoC bug.
-	 */
 	clock-frequency = <100000>;
 	pinctrl-names = "default", "gpio";
 	pinctrl-0 = <&pinctrl_i2c3>;
@@ -393,10 +389,6 @@
 };
 
 &i2c4 {
-	/*
-	 * iMX8MP 1P33A Errata ERR007805
-	 * I2C is limited to 384 kHz due to SoC bug.
-	 */
 	clock-frequency = <100000>;
 	pinctrl-names = "default", "gpio";
 	pinctrl-0 = <&pinctrl_i2c4>;
@@ -407,10 +399,6 @@
 };
 
 &i2c5 {	/* HDMI EDID bus */
-	/*
-	 * iMX8MP 1P33A Errata ERR007805
-	 * I2C is limited to 384 kHz due to SoC bug.
-	 */
 	clock-frequency = <100000>;
 	pinctrl-names = "default", "gpio";
 	pinctrl-0 = <&pinctrl_i2c5>;
@@ -802,8 +790,8 @@
 
 	pinctrl_i2c5: dhcom-i2c5-grp {
 		fsl,pins = <
-			MX8MP_IOMUXC_HDMI_DDC_SCL__HDMIMIX_HDMI_SCL	0x40000084
-			MX8MP_IOMUXC_HDMI_DDC_SDA__HDMIMIX_HDMI_SDA	0x40000084
+			MX8MP_IOMUXC_HDMI_DDC_SCL__I2C5_SCL		0x40000084
+			MX8MP_IOMUXC_HDMI_DDC_SDA__I2C5_SDA		0x40000084
 		>;
 	};
 
@@ -830,7 +818,7 @@
 	pinctrl_rtc: dhcom-rtc-grp {
 		fsl,pins = <
 			/* RTC_#INT Interrupt */
-			MX8MP_IOMUXC_SPDIF_EXT_CLK__GPIO5_IO05		0x400001c6
+			MX8MP_IOMUXC_SPDIF_EXT_CLK__GPIO5_IO05		0x40000080
 		>;
 	};
 
arch/arm/dts/imx8mp-evk.dts +71 -55

212 lines not on this page · raw message

arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts +24 -24

93 lines not on this page · raw message

arch/arm/dts/imx8mp-u-boot.dtsi +1 -1
index adb24cccc3b..ddced009903 100644
@@ -10,7 +10,7 @@
 	};
 };
 
-&{/soc@0} {
+&soc {
 	u-boot,dm-pre-reloc;
 	u-boot,dm-spl;
 };
arch/arm/dts/imx8mp-venice-gw74xx.dts +58 -58

201 lines not on this page · raw message

arch/arm/dts/imx8mp-verdin.dtsi +11 -3
index 68100a17263..900eae8e448 100644
@@ -49,7 +49,7 @@
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_gpio_keys>;
 
-		wakeup {
+		button-wakeup {
 			debounce-interval = <10>;
 			/* Verdin CTRL_WAKE1_MICO# (SODIMM 252) */
 			gpios = <&gpio4 0 GPIO_ACTIVE_LOW>;
@@ -146,6 +146,14 @@
 	};
 };
 
+&cpu_alert0 {
+	temperature = <95000>;
+};
+
+&cpu_crit0 {
+	temperature = <105000>;
+};
+
 /* Verdin SPI_1 */
 &ecspi1 {
 	#address-cells = <1>;
@@ -619,7 +627,7 @@
 		interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
 		reg = <0x4a>;
 		/* Verdin GPIO_2 (SODIMM 208) */
-		reset-gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
+		reset-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
 		status = "disabled";
 	};
 };
@@ -696,7 +704,7 @@
 		pinctrl-0 = <&pinctrl_gpio_9_dsi>, <&pinctrl_i2s_2_bclk_touch_reset>;
 		reg = <0x4a>;
 		/* Verdin I2S_2_BCLK (TOUCH_RESET#, SODIMM 42) */
-		reset-gpios = <&gpio5 0 GPIO_ACTIVE_HIGH>;
+		reset-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
 		status = "disabled";
 	};
 
arch/arm/dts/imx8mp.dtsi +27 -6
index d9542dfff83..fe178b7d063 100644
@@ -195,7 +195,7 @@
 	clk_ext4: clock-ext4 {
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
-		clock-frequency= <133000000>;
+		clock-frequency = <133000000>;
 		clock-output-names = "clk_ext4";
 	};
 
@@ -293,7 +293,7 @@
 		arm,no-tick-in-suspend;
 	};
 
-	soc@0 {
+	soc: soc@0 {
 		compatible = "fsl,imx8mp-soc", "simple-bus";
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -595,7 +595,7 @@
 					pgc_ispdwp: power-domain@18 {
 						#power-domain-cells = <0>;
 						reg = <IMX8MP_POWER_DOMAIN_MEDIAMIX_ISPDWP>;
-						clocks = <&clk IMX8MP_CLK_MEDIA_ISP_DIV>;
+						clocks = <&clk IMX8MP_CLK_MEDIA_ISP_ROOT>;
 					};
 				};
 			};
@@ -791,6 +791,7 @@
 					compatible = "fsl,sec-v4.0-job-ring";
 					reg = <0x1000 0x1000>;
 					interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
+					status = "disabled";
 				};
 
 				sec_jr1: jr@2000 {
@@ -903,7 +904,7 @@
 					 <&clk IMX8MP_CLK_USDHC1_ROOT>;
 				clock-names = "ipg", "ahb", "per";
 				fsl,tuning-start-tap = <20>;
-				fsl,tuning-step= <2>;
+				fsl,tuning-step = <2>;
 				bus-width = <4>;
 				status = "disabled";
 			};
@@ -917,7 +918,7 @@
 					 <&clk IMX8MP_CLK_USDHC2_ROOT>;
 				clock-names = "ipg", "ahb", "per";
 				fsl,tuning-start-tap = <20>;
-				fsl,tuning-step= <2>;
+				fsl,tuning-step = <2>;
 				bus-width = <4>;
 				status = "disabled";
 			};
@@ -931,7 +932,7 @@
 					 <&clk IMX8MP_CLK_USDHC3_ROOT>;
 				clock-names = "ipg", "ahb", "per";
 				fsl,tuning-start-tap = <20>;
-				fsl,tuning-step= <2>;
+				fsl,tuning-step = <2>;
 				bus-width = <4>;
 				status = "disabled";
 			};
@@ -1018,6 +1019,26 @@
 			};
 		};
 
+		noc: interconnect@32700000 {
+			compatible = "fsl,imx8mp-noc", "fsl,imx8m-noc";
+			reg = <0x32700000 0x100000>;
+			clocks = <&clk IMX8MP_CLK_NOC>;
+			#interconnect-cells = <1>;
+			operating-points-v2 = <&noc_opp_table>;
+
+			noc_opp_table: opp-table {
+				compatible = "operating-points-v2";
+
+				opp-200M {
+					opp-hz = /bits/ 64 <200000000>;
+				};
+
+				opp-1000M {
+					opp-hz = /bits/ 64 <1000000000>;
+				};
+			};
+		};
+
 		aips4: bus@32c00000 {
 			compatible = "fsl,aips-bus", "simple-bus";
 			reg = <0x32c00000 0x400000>;
include/dt-bindings/clock/imx8mp-clock.h +8 -5
index e8d68fbb6e3..9d5cc2ddde8 100644
@@ -117,7 +117,6 @@
 #define IMX8MP_CLK_AUDIO_AHB			108
 #define IMX8MP_CLK_MIPI_DSI_ESC_RX		109
 #define IMX8MP_CLK_IPG_ROOT			110
-#define IMX8MP_CLK_IPG_AUDIO_ROOT		111
 #define IMX8MP_CLK_DRAM_ALT			112
 #define IMX8MP_CLK_DRAM_APB			113
 #define IMX8MP_CLK_VPU_G1			114
@@ -125,7 +124,6 @@
 #define IMX8MP_CLK_CAN1				116
 #define IMX8MP_CLK_CAN2				117
 #define IMX8MP_CLK_MEMREPAIR			118
-#define IMX8MP_CLK_PCIE_PHY			119
 #define IMX8MP_CLK_PCIE_AUX			120
 #define IMX8MP_CLK_I2C5				121
 #define IMX8MP_CLK_I2C6				122
@@ -182,8 +180,6 @@
 #define IMX8MP_CLK_MEDIA_CAM2_PIX		173
 #define IMX8MP_CLK_MEDIA_LDB			174
 #define IMX8MP_CLK_MEDIA_MIPI_CSI2_ESC		175
-#define IMX8MP_CLK_PCIE2_CTRL			176
-#define IMX8MP_CLK_PCIE2_PHY			177
 #define IMX8MP_CLK_MEDIA_MIPI_TEST_BYTE		178
 #define IMX8MP_CLK_ECSPI3			179
 #define IMX8MP_CLK_PDM				180
@@ -321,8 +317,15 @@
 #define IMX8MP_CLK_AUDIO_AXI			310
 #define IMX8MP_CLK_HSIO_AXI			311
 #define IMX8MP_CLK_MEDIA_ISP			312
+#define IMX8MP_CLK_MEDIA_DISP2_PIX		313
+#define IMX8MP_CLK_CLKOUT1_SEL			314
+#define IMX8MP_CLK_CLKOUT1_DIV			315
+#define IMX8MP_CLK_CLKOUT1			316
+#define IMX8MP_CLK_CLKOUT2_SEL			317
+#define IMX8MP_CLK_CLKOUT2_DIV			318
+#define IMX8MP_CLK_CLKOUT2			319
 
-#define IMX8MP_CLK_END				313
+#define IMX8MP_CLK_END				320
 
 #define IMX8MP_CLK_AUDIOMIX_SAI1_IPG		0
 #define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK1		1
include/dt-bindings/power/imx8mp-power.h +11 -4
index 3f72bf7818f..7789bcca322 100644
@@ -38,9 +38,16 @@
 #define IMX8MP_MEDIABLK_PD_ISI				3
 #define IMX8MP_MEDIABLK_PD_MIPI_CSI2_2			4
 #define IMX8MP_MEDIABLK_PD_LCDIF_2			5
-#define IMX8MP_MEDIABLK_PD_ISP2				6
-#define IMX8MP_MEDIABLK_PD_ISP1				7
-#define IMX8MP_MEDIABLK_PD_DWE				8
-#define IMX8MP_MEDIABLK_PD_MIPI_DSI_2			9
+#define IMX8MP_MEDIABLK_PD_ISP				6
+#define IMX8MP_MEDIABLK_PD_DWE				7
+#define IMX8MP_MEDIABLK_PD_MIPI_DSI_2			8
+
+#define IMX8MP_HDMIBLK_PD_IRQSTEER			0
+#define IMX8MP_HDMIBLK_PD_LCDIF				1
+#define IMX8MP_HDMIBLK_PD_PAI				2
+#define IMX8MP_HDMIBLK_PD_PVI				3
+#define IMX8MP_HDMIBLK_PD_TRNG				4
+#define IMX8MP_HDMIBLK_PD_HDMI_TX			5
+#define IMX8MP_HDMIBLK_PD_HDMI_TX_PHY			6
 
 #endif
include/dt-bindings/reset/imx8mp-reset.h new file +50 -0

50 lines not on this page · raw message

Signature · 1 line
2.35.1
#10 lore raw

PATCH v2 7/8 imx8mn: synchronise device tree with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v6.0-rc1.

---

(no changes since v1)

 arch/arm/dts/imx8mn-beacon-baseboard.dtsi     |  4 +-
 arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi    |  2 +-
 .../dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi  |  2 +-
 arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi      |  2 +-
 arch/arm/dts/imx8mn-evk.dtsi                  | 45 ++++++++++++++++++-
 .../dts/imx8mn-var-som-symphony-u-boot.dtsi   |  2 +-
 arch/arm/dts/imx8mn-var-som-symphony.dts      |  6 +--
 arch/arm/dts/imx8mn-venice-gw7902.dts         |  8 ++--
 arch/arm/dts/imx8mn-venice-u-boot.dtsi        |  2 +-
 arch/arm/dts/imx8mn.dtsi                      | 13 +++---
 include/dt-bindings/interconnect/imx8mn.h     | 41 +++++++++++++++++
 11 files changed, 106 insertions(+), 21 deletions(-)
 create mode 100644 include/dt-bindings/interconnect/imx8mn.h
arch/arm/dts/imx8mn-beacon-baseboard.dtsi +2 -2
index 02f37dcda7e..9e82069c941 100644
@@ -146,7 +146,7 @@
 };
 
 &easrc {
-	fsl,asrc-rate  = <48000>;
+	fsl,asrc-rate = <48000>;
 	status = "okay";
 };
 
@@ -182,7 +182,7 @@
 &usbotg1 {
 	vbus-supply = <&reg_usb_otg_vbus>;
 	disable-over-current;
-	dr_mode="otg";
+	dr_mode = "otg";
 	status = "okay";
 };
 
arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi +1 -1
index 5f839524028..6d8ba4c39af 100644
@@ -15,7 +15,7 @@
 	};
 };
 
-&{/soc@0} {
+&soc {
 	u-boot,dm-pre-reloc;
 	u-boot,dm-spl;
 };
arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi +1 -1
index c4ae7ca4f31..8312b64bcc0 100644
@@ -16,7 +16,7 @@
 	};
 };
 
-&{/soc@0} {
+&soc {
 	u-boot,dm-pre-reloc;
 	u-boot,dm-spl;
 };
arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi +1 -1
index 78773c198e4..edd9b959d09 100644
@@ -21,7 +21,7 @@
 	};
 };
 
-&{/soc@0} {
+&soc {
 	u-boot,dm-pre-reloc;
 	u-boot,dm-spl;
 };
arch/arm/dts/imx8mn-evk.dtsi +44 -1

75 lines not on this page · raw message

arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi +1 -1
index ed1ab10ded3..28fcb10e595 100644
@@ -15,7 +15,7 @@
 	};
 };
 
-&{/soc@0} {
+&soc {
 	u-boot,dm-pre-reloc;
 	u-boot,dm-spl;
 };
arch/arm/dts/imx8mn-var-som-symphony.dts +3 -3
index f61c48776cf..3ed7021a487 100644
@@ -26,19 +26,19 @@
 	gpio-keys {
 		compatible = "gpio-keys";
 
-		back {
+		key-back {
 			label = "Back";
 			gpios = <&pca9534 1 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_BACK>;
 		};
 
-		home {
+		key-home {
 			label = "Home";
 			gpios = <&pca9534 2 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_HOME>;
 		};
 
-		menu {
+		key-menu {
 			label = "Menu";
 			gpios = <&pca9534 3 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_MENU>;
arch/arm/dts/imx8mn-venice-gw7902.dts +4 -4
index 367a232675a..636f8602b97 100644
@@ -39,13 +39,13 @@
 	gpio-keys {
 		compatible = "gpio-keys";
 
-		user-pb {
+		key-user-pb {
 			label = "user_pb";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 			linux,code = <BTN_0>;
 		};
 
-		user-pb1x {
+		key-user-pb1x {
 			label = "user_pb1x";
 			linux,code = <BTN_1>;
 			interrupt-parent = <&gsc>;
@@ -59,14 +59,14 @@
 			interrupts = <1>;
 		};
 
-		eeprom-wp {
+		key-eeprom-wp {
 			label = "eeprom_wp";
 			linux,code = <BTN_3>;
 			interrupt-parent = <&gsc>;
 			interrupts = <2>;
 		};
 
-		tamper {
+		key-tamper {
 			label = "tamper";
 			linux,code = <BTN_4>;
 			interrupt-parent = <&gsc>;
arch/arm/dts/imx8mn-venice-u-boot.dtsi +1 -1
index 9fb38714523..1f4993cb670 100644
@@ -15,7 +15,7 @@
 	};
 };
 
-&{/soc@0} {
+&soc {
 	u-boot,dm-pre-reloc;
 	u-boot,dm-spl;
 };
arch/arm/dts/imx8mn.dtsi +7 -6
index e41e1d56f98..0c71b740a31 100644
@@ -212,7 +212,7 @@
 	clk_ext4: clock-ext4 {
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
-		clock-frequency= <133000000>;
+		clock-frequency = <133000000>;
 		clock-output-names = "clk_ext4";
 	};
 
@@ -269,7 +269,7 @@
 		arm,no-tick-in-suspend;
 	};
 
-	soc@0 {
+	soc: soc@0 {
 		compatible = "fsl,imx8mn-soc", "simple-bus";
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -422,7 +422,7 @@
 						    "ctx2_rx", "ctx2_tx",
 						    "ctx3_rx", "ctx3_tx";
 					firmware-name = "imx/easrc/easrc-imx8mn.bin";
-					fsl,asrc-rate  = <8000>;
+					fsl,asrc-rate = <8000>;
 					fsl,asrc-format = <2>;
 					status = "disabled";
 				};
@@ -857,6 +857,7 @@
 					 compatible = "fsl,sec-v4.0-job-ring";
 					 reg = <0x1000 0x1000>;
 					 interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
+					 status = "disabled";
 				};
 
 				sec_jr1: jr@2000 {
@@ -941,7 +942,7 @@
 					 <&clk IMX8MN_CLK_USDHC1_ROOT>;
 				clock-names = "ipg", "ahb", "per";
 				fsl,tuning-start-tap = <20>;
-				fsl,tuning-step= <2>;
+				fsl,tuning-step = <2>;
 				bus-width = <4>;
 				status = "disabled";
 			};
@@ -955,7 +956,7 @@
 					 <&clk IMX8MN_CLK_USDHC2_ROOT>;
 				clock-names = "ipg", "ahb", "per";
 				fsl,tuning-start-tap = <20>;
-				fsl,tuning-step= <2>;
+				fsl,tuning-step = <2>;
 				bus-width = <4>;
 				status = "disabled";
 			};
@@ -969,7 +970,7 @@
 					 <&clk IMX8MN_CLK_USDHC3_ROOT>;
 				clock-names = "ipg", "ahb", "per";
 				fsl,tuning-start-tap = <20>;
-				fsl,tuning-step= <2>;
+				fsl,tuning-step = <2>;
 				bus-width = <4>;
 				status = "disabled";
 			};
include/dt-bindings/interconnect/imx8mn.h new file +41 -0

41 lines not on this page · raw message

Signature · 1 line
2.35.1
#11 lore raw

PATCH v2 8/8 imx8mm: synchronise device tree with linux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v6.0-rc1.

---

(no changes since v1)

 arch/arm/dts/imx8mm-beacon-baseboard.dtsi |  4 +-
 arch/arm/dts/imx8mm-evk.dtsi              | 43 +++++++++++++++++++
 arch/arm/dts/imx8mm-icore-mx8mm.dtsi      | 12 +++---
 arch/arm/dts/imx8mm-mx8menlo.dts          |  4 +-
 arch/arm/dts/imx8mm-u-boot.dtsi           |  2 +-
 arch/arm/dts/imx8mm-venice-gw700x.dtsi    | 24 +++++------
 arch/arm/dts/imx8mm-venice-gw7901.dts     |  8 ++--
 arch/arm/dts/imx8mm-venice-gw7902.dts     | 10 ++---
 arch/arm/dts/imx8mm-venice-gw7903.dts     |  6 +--
 arch/arm/dts/imx8mm-verdin.dtsi           | 10 ++++-
 include/dt-bindings/interconnect/imx8mm.h | 50 +++++++++++++++++++++++
 11 files changed, 137 insertions(+), 36 deletions(-)
 create mode 100644 include/dt-bindings/interconnect/imx8mm.h
arch/arm/dts/imx8mm-beacon-baseboard.dtsi +2 -2
index f338a886d81..03266bd90a0 100644
@@ -285,14 +285,14 @@
 &usbotg1 {
 	vbus-supply = <&reg_usbotg1>;
 	disable-over-current;
-	dr_mode="otg";
+	dr_mode = "otg";
 	status = "okay";
 };
 
 &usbotg2 {
 	pinctrl-names = "default";
 	disable-over-current;
-	dr_mode="host";
+	dr_mode = "host";
 	status = "okay";
 };
 
arch/arm/dts/imx8mm-evk.dtsi +43 -0

67 lines not on this page · raw message

arch/arm/dts/imx8mm-icore-mx8mm.dtsi +6 -6
index b40148d728e..9e6170d9394 100644
@@ -84,42 +84,42 @@
 			};
 
 			reg_buck1: buck1 {
-				regulator-min-microvolt =  <400000>;
+				regulator-min-microvolt = <400000>;
 				regulator-max-microvolt = <1800000>;
 				regulator-always-on;
 				regulator-boot-on;
 			};
 
 			reg_buck2: buck2 {
-				regulator-min-microvolt =  <400000>;
+				regulator-min-microvolt = <400000>;
 				regulator-max-microvolt = <1800000>;
 				regulator-always-on;
 				regulator-boot-on;
 			};
 
 			reg_buck3: buck3 {
-				regulator-min-microvolt =  <400000>;
+				regulator-min-microvolt = <400000>;
 				regulator-max-microvolt = <1800000>;
 				regulator-always-on;
 				regulator-boot-on;
 			};
 
 			reg_buck4: buck4 {
-				regulator-min-microvolt =  <400000>;
+				regulator-min-microvolt = <400000>;
 				regulator-max-microvolt = <1800000>;
 				regulator-always-on;
 				regulator-boot-on;
 			};
 
 			reg_buck5: buck5 {
-				regulator-min-microvolt =  <400000>;
+				regulator-min-microvolt = <400000>;
 				regulator-max-microvolt = <1800000>;
 				regulator-always-on;
 				regulator-boot-on;
 			};
 
 			reg_buck6: buck6 {
-				regulator-min-microvolt =  <400000>;
+				regulator-min-microvolt = <400000>;
 				regulator-max-microvolt = <1800000>;
 				regulator-always-on;
 				regulator-boot-on;
arch/arm/dts/imx8mm-mx8menlo.dts +2 -2
index 92eaf4ef456..c97f4e06ae5 100644
@@ -20,13 +20,13 @@
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_led>;
 
-		user1 {
+		led-1 {
 			label = "TestLed601";
 			gpios = <&gpio4 18 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "mmc0";
 		};
 
-		user2 {
+		led-2 {
 			label = "TestLed602";
 			gpios = <&gpio4 10 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "heartbeat";
arch/arm/dts/imx8mm-u-boot.dtsi +1 -1
index f792b421e89..05fd3e6aac1 100644
@@ -9,7 +9,7 @@
 	};
 };
 
-&{/soc@0} {
+&soc {
 	u-boot,dm-pre-reloc;
 	u-boot,dm-spl;
 };
arch/arm/dts/imx8mm-venice-gw700x.dtsi +12 -12
index 00f86cada30..66a0d103c90 100644
@@ -16,13 +16,13 @@
 	gpio-keys {
 		compatible = "gpio-keys";
 
-		user-pb {
+		key-user-pb {
 			label = "user_pb";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 			linux,code = <BTN_0>;
 		};
 
-		user-pb1x {
+		key-user-pb1x {
 			label = "user_pb1x";
 			linux,code = <BTN_1>;
 			interrupt-parent = <&gsc>;
@@ -36,14 +36,14 @@
 			interrupts = <1>;
 		};
 
-		eeprom-wp {
+		key-eeprom-wp {
 			label = "eeprom_wp";
 			linux,code = <BTN_3>;
 			interrupt-parent = <&gsc>;
 			interrupts = <2>;
 		};
 
-		tamper {
+		key-tamper {
 			label = "tamper";
 			linux,code = <BTN_4>;
 			interrupt-parent = <&gsc>;
@@ -286,8 +286,8 @@
 				regulator-name = "buck1";
 				regulator-min-microvolt = <800000>;
 				regulator-max-microvolt = <1000000>;
-				regulator-min-microamp  = <3800000>;
-				regulator-max-microamp  = <6800000>;
+				regulator-min-microamp = <3800000>;
+				regulator-max-microamp = <6800000>;
 				regulator-boot-on;
 				regulator-always-on;
 			};
@@ -297,8 +297,8 @@
 				regulator-name = "buck2";
 				regulator-min-microvolt = <800000>;
 				regulator-max-microvolt = <900000>;
-				regulator-min-microamp  = <2200000>;
-				regulator-max-microamp  = <5200000>;
+				regulator-min-microamp = <2200000>;
+				regulator-max-microamp = <5200000>;
 				regulator-boot-on;
 				regulator-always-on;
 			};
@@ -308,8 +308,8 @@
 				regulator-name = "buck3";
 				regulator-min-microvolt = <800000>;
 				regulator-max-microvolt = <1000000>;
-				regulator-min-microamp  = <3800000>;
-				regulator-max-microamp  = <6800000>;
+				regulator-min-microamp = <3800000>;
+				regulator-max-microamp = <6800000>;
 				regulator-always-on;
 			};
 
@@ -318,8 +318,8 @@
 				regulator-name = "buck4";
 				regulator-min-microvolt = <1800000>;
 				regulator-max-microvolt = <1800000>;
-				regulator-min-microamp  = <2200000>;
-				regulator-max-microamp  = <5200000>;
+				regulator-min-microamp = <2200000>;
+				regulator-max-microamp = <5200000>;
 				regulator-boot-on;
 				regulator-always-on;
 			};
arch/arm/dts/imx8mm-venice-gw7901.dts +4 -4
index 24737e89038..35fb929e7bc 100644
@@ -38,13 +38,13 @@
 	gpio-keys {
 		compatible = "gpio-keys";
 
-		user-pb {
+		key-user-pb {
 			label = "user_pb";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 			linux,code = <BTN_0>;
 		};
 
-		user-pb1x {
+		key-user-pb1x {
 			label = "user_pb1x";
 			linux,code = <BTN_1>;
 			interrupt-parent = <&gsc>;
@@ -58,14 +58,14 @@
 			interrupts = <1>;
 		};
 
-		eeprom-wp {
+		key-eeprom-wp {
 			label = "eeprom_wp";
 			linux,code = <BTN_3>;
 			interrupt-parent = <&gsc>;
 			interrupts = <2>;
 		};
 
-		tamper {
+		key-tamper {
 			label = "tamper";
 			linux,code = <BTN_4>;
 			interrupt-parent = <&gsc>;
arch/arm/dts/imx8mm-venice-gw7902.dts +5 -5
index 407ab4592b4..6dc5eda2d25 100644
@@ -42,13 +42,13 @@
 	gpio-keys {
 		compatible = "gpio-keys";
 
-		user-pb {
+		key-user-pb {
 			label = "user_pb";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 			linux,code = <BTN_0>;
 		};
 
-		user-pb1x {
+		key-user-pb1x {
 			label = "user_pb1x";
 			linux,code = <BTN_1>;
 			interrupt-parent = <&gsc>;
@@ -62,14 +62,14 @@
 			interrupts = <1>;
 		};
 
-		eeprom-wp {
+		key-eeprom-wp {
 			label = "eeprom_wp";
 			linux,code = <BTN_3>;
 			interrupt-parent = <&gsc>;
 			interrupts = <2>;
 		};
 
-		tamper {
+		key-tamper {
 			label = "tamper";
 			linux,code = <BTN_4>;
 			interrupt-parent = <&gsc>;
@@ -651,7 +651,7 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_uart1>, <&pinctrl_uart1_gpio>;
 	rts-gpios = <&gpio4 10 GPIO_ACTIVE_LOW>;
-	cts-gpios = <&gpio4 11 GPIO_ACTIVE_LOW>;
+	cts-gpios = <&gpio4 24 GPIO_ACTIVE_LOW>;
 	uart-has-rtscts;
 	status = "okay";
 };
arch/arm/dts/imx8mm-venice-gw7903.dts +3 -3
index a7dae9bd4c1..a65761a53f2 100644
@@ -33,13 +33,13 @@
 	gpio-keys {
 		compatible = "gpio-keys";
 
-		user-pb {
+		key-user-pb {
 			label = "user_pb";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 			linux,code = <BTN_0>;
 		};
 
-		user-pb1x {
+		key-user-pb1x {
 			label = "user_pb1x";
 			linux,code = <BTN_1>;
 			interrupt-parent = <&gsc>;
@@ -53,7 +53,7 @@
 			interrupts = <1>;
 		};
 
-		eeprom-wp {
+		key-eeprom-wp {
 			label = "eeprom_wp";
 			linux,code = <BTN_3>;
 			interrupt-parent = <&gsc>;
arch/arm/dts/imx8mm-verdin.dtsi +9 -1
index eafa88d980b..d1b4582f44c 100644
@@ -43,7 +43,7 @@
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_gpio_keys>;
 
-		wakeup {
+		key-wakeup {
 			debounce-interval = <10>;
 			/* Verdin CTRL_WAKE1_MICO# (SODIMM 252) */
 			gpios = <&gpio4 28 GPIO_ACTIVE_LOW>;
@@ -154,6 +154,14 @@
 	cpu-supply = <&reg_vdd_arm>;
 };
 
+&cpu_alert0 {
+	temperature = <95000>;
+};
+
+&cpu_crit0 {
+	temperature = <105000>;
+};
+
 &ddrc {
 	operating-points-v2 = <&ddrc_opp_table>;
 
include/dt-bindings/interconnect/imx8mm.h new file +50 -0

50 lines not on this page · raw message

Signature · 1 line
2.35.1