Skip to contentSkip to conversation

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

PATCH Superseded Marcel Ziswiler 5 participants 16 messages Nov 5, 2022 – Nov 7, 2022

Subsystems (8)

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v4 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.1-rc3). 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 v4:
- Re-synched with v6.1-rc3 which now already contains the recent DDR pinmux addition.
- Re-named commit subject and re-worded commit message to indicate migration to automatic build system included -u-boot.dtsi device tree include files. Thanks to Giulio for pointing this out.
- Use imxrt1050-evk-u-boot.dtsi as provided/tested by Jesse.
- Explain intent in commit message as pointed out by Giulio.
- Re-synched with v6.1-rc3.
- Re-based after Adam's common imx8mn-u-boot device tree creation.

Changes in v3:
- Incorporate feedback from Jesse.

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: migrate to build system included -u-boot.dtsi
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          |  14 +-
 arch/arm/dts/imx8mm-mx8menlo.dts              |  14 +-
 arch/arm/dts/imx8mm-u-boot.dtsi               |   2 +-
 arch/arm/dts/imx8mm-venice-gw700x.dtsi        |  24 +-
 arch/arm/dts/imx8mm-venice-gw7901.dts         |  12 +-
 arch/arm/dts/imx8mm-venice-gw7902.dts         |  14 +-
 arch/arm/dts/imx8mm-venice-gw7903.dts         |   6 +-
 arch/arm/dts/imx8mm-venice-gw7904.dts         |   4 +
 arch/arm/dts/imx8mm-verdin.dtsi               |  50 +-
 arch/arm/dts/imx8mn-beacon-baseboard.dtsi     |   4 +-
 arch/arm/dts/imx8mn-evk.dtsi                  |  45 +-
 arch/arm/dts/imx8mn-var-som-symphony.dts      |   6 +-
 arch/arm/dts/imx8mn-venice-gw7902.dts         |   9 +-
 arch/arm/dts/imx8mn.dtsi                      |  14 +-
 arch/arm/dts/imx8mp-dhcom-pdk2.dts            |  29 +-
 arch/arm/dts/imx8mp-dhcom-som.dtsi            |  20 +-
 arch/arm/dts/imx8mp-evk.dts                   | 179 ++++--
 arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2.dts  |   2 +-
 arch/arm/dts/imx8mp-icore-mx8mp.dtsi          |   2 +-
 arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts   |  48 +-
 arch/arm/dts/imx8mp-u-boot.dtsi               |   2 +-
 arch/arm/dts/imx8mp-venice-gw74xx.dts         | 284 ++++++---
 arch/arm/dts/imx8mp-verdin.dtsi               |  32 +-
 arch/arm/dts/imx8mp.dtsi                      | 147 ++++-
 arch/arm/dts/imx8mq-evk.dts                   |  43 ++
 arch/arm/dts/imx8mq-librem5-r3.dtsi           |  45 ++
 arch/arm/dts/imx8mq-librem5-r4.dts            |  20 +-
 arch/arm/dts/imx8mq-librem5.dtsi              | 153 ++++-
 arch/arm/dts/imx8mq-u-boot.dtsi               |  10 +-
 arch/arm/dts/imx8mq.dtsi                      |  19 +-
 arch/arm/dts/imx8ulp-evk-u-boot.dtsi          |  15 +-
 arch/arm/dts/imx8ulp-evk.dts                  | 240 ++-----
 arch/arm/dts/imx8ulp-pinfunc.h                |   4 +-
 arch/arm/dts/imx8ulp.dtsi                     | 594 +++++-------------
 arch/arm/dts/imxrt1020-evk-u-boot.dtsi        |   7 +-
 arch/arm/dts/imxrt1020-evk.dts                |   1 -
 arch/arm/dts/imxrt1050-evk-u-boot.dtsi        | 174 ++++-
 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     |  53 +-
 include/dt-bindings/clock/imxrt1050-clock.h   |   9 +-
 include/dt-bindings/interconnect/fsl,imx8mp.h |  59 ++
 include/dt-bindings/interconnect/imx8mm.h     |  50 ++
 include/dt-bindings/interconnect/imx8mn.h     |  41 ++
 include/dt-bindings/power/imx8mp-power.h      |  21 +-
 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 ++
 54 files changed, 1881 insertions(+), 1325 deletions(-)
 create mode 100644 arch/arm/dts/imx8mq-librem5-r3.dtsi
 create mode 100644 include/dt-bindings/interconnect/fsl,imx8mp.h
 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 v4 1/8 vf610: synchronise device tree with linux

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v6.1-rc3.

---

Changes in v4:
- Re-synched with v6.1-rc3 which now already contains the recent DDR pinmux addition.

 arch/arm/dts/vf610-pinfunc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/vf610-pinfunc.h +1 -1
index 740276431a..b7b7322a2d 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 v4 2/8 imxrt1020: migrate to build system included -u-boot.dtsi

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Migrate to using automatic build system included -u-boot.dtsi device tree include files.

---

Changes in v4:
- Re-named commit subject and re-worded commit message to indicate migration to automatic build system included -u-boot.dtsi device tree include files. Thanks to Giulio for pointing this out.

 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 9e1b074d2e..7cab486f5f 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 22ae5ed735..d4d1de4ea8 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
Reviewed-by Tested-by on v4 2/8
#3 lore raw

Re: [PATCH v4 2/8] imxrt1020: migrate to build system included -u-boot.dtsi

Hi Marcel,

Quoted 6 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Migrate to using automatic build system included -u-boot.dtsi device tree include files.

and:

Signature · 2 lines
Giulio Benetti
CEO/CTO@Benetti Engineering sas
Quoted 48 lines

---

Changes in v4:
- Re-named commit subject and re-worded commit message to indicate migration to automatic build system included -u-boot.dtsi device tree include files. Thanks to Giulio for pointing this out.

  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 9e1b074d2e..7cab486f5f 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 22ae5ed735..d4d1de4ea8 100644
@@ -6,7 +6,6 @@
 
  /dts-v1/;
  #include "imxrt1020.dtsi"
-#include "imxrt1020-evk-u-boot.dtsi"
  #include "imxrt1020-pinfunc.h"
 
  / {
#4 lore raw

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

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v6.1-rc3.

Note: Nowadays, the intent is for them regular device trees to just be synchronised from them Linux kernel device trees and any and all U-Boot specific changes need to go into the -u-boot.dtsi device tree include files which BTW get included automatically by the U-Boot build system.

---

Changes in v4:
- Use imxrt1050-evk-u-boot.dtsi as provided/tested by Jesse.
- Explain intent in commit message as pointed out by Giulio.
- Re-synched with v6.1-rc3.

Changes in v3:
- Incorporate feedback from Jesse.

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      | 174 +++++++++++--
 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, 263 insertions(+), 347 deletions(-)
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +154 -20
index 617cece448..d6eba12576 100644
@@ -4,9 +4,13 @@
  * Author(s): Giulio Benetti <[email protected]>
  */
 
+#include <dt-bindings/memory/imxrt-sdram.h>
+#include "imxrt1050-pinfunc.h"
+
 / {
 	chosen {
 		u-boot,dm-spl;
+		tick-timer = &gpt;
 	};
 
 	clocks {
@@ -15,6 +19,53 @@
 
 	soc {
 		u-boot,dm-spl;
+		semc: semc@402f0000 {
+			compatible = "fsl,imxrt-semc";
+			reg = <0x402f0000 0x4000>;
+			clocks = <&clks IMXRT1050_CLK_SEMC>;
+			pinctrl-0 = <&pinctrl_semc>;
+			pinctrl-names = "default";
+			status = "okay";
+		};
+	};
+};
+
+&semc {
+	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;
 	};
 };
 
@@ -31,60 +82,143 @@
 };
 
 &gpio1 {
+	compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio";
 	u-boot,dm-spl;
 };
 
 &gpio2 {
+	compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio";
 	u-boot,dm-spl;
 };
 
 &gpio3 {
+	compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio";
 	u-boot,dm-spl;
 };
 
 &gpio4 {
+	compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio";
 	u-boot,dm-spl;
 };
 
 &gpio5 {
+	compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio";
 	u-boot,dm-spl;
 };
 
-&gpt1 {
+&gpt {
+	clocks = <&osc>;
+	compatible = "fsl,imxrt-gpt";
+	status = "okay";
 	u-boot,dm-spl;
 };
 
 &lpuart1 { /* console */
+	compatible = "fsl,imxrt-lpuart";
 	u-boot,dm-spl;
 };
 
-&semc {
+&iomuxc {
 	u-boot,dm-spl;
-
-	bank1: bank@0 {
+	compatible = "fsl,imxrt-iomuxc";
+	pinctrl-0 = <&pinctrl_lpuart1>;
+
+	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 */
+		>;
 		u-boot,dm-spl;
 	};
-};
-
-&iomuxc {
-	u-boot,dm-spl;
 
-	imxrt1050-evk {
+	pinctrl_lpuart1: lpuart1grp {
 		u-boot,dm-spl;
-		pinctrl_lpuart1: lpuart1grp {
-			u-boot,dm-spl;
-		};
-
-		pinctrl_semc: semcgrp {
-			u-boot,dm-spl;
-		};
+	};
 
-		pinctrl_usdhc0: usdhc0grp {
-			u-boot,dm-spl;
-		};
+	pinctrl_usdhc0: usdhc0grp {
+		u-boot,dm-spl;
 	};
-};
+ };
 
 &usdhc1 {
+	compatible = "fsl,imxrt-usdhc";
 	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 a29031ab3d..22c14a3262 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 f74dbbcf93..93bef0832d 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
#5 lore raw

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

Hi Marcel,

Quoted 131 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v6.1-rc3.

Note: Nowadays, the intent is for them regular device trees to just be synchronised from them Linux kernel device trees and any and all U-Boot specific changes need to go into the -u-boot.dtsi device tree include files which BTW get included automatically by the U-Boot build system.

---

Changes in v4:
- Use imxrt1050-evk-u-boot.dtsi as provided/tested by Jesse.
- Explain intent in commit message as pointed out by Giulio.
- Re-synched with v6.1-rc3.

Changes in v3:
- Incorporate feedback from Jesse.

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      | 174 +++++++++++--
  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, 263 insertions(+), 347 deletions(-)
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +56 -0
index 617cece448..d6eba12576 100644
@@ -4,9 +4,13 @@
   * Author(s): Giulio Benetti <[email protected]>
   */
 
+#include <dt-bindings/memory/imxrt-sdram.h>
+#include "imxrt1050-pinfunc.h"
+
  / {
  	chosen {
  		u-boot,dm-spl;
+		tick-timer = &gpt;
  	};
 
  	clocks {
@@ -15,6 +19,53 @@
 
  	soc {
  		u-boot,dm-spl;
+		semc: semc@402f0000 {
+			compatible = "fsl,imxrt-semc";
+			reg = <0x402f0000 0x4000>;
+			clocks = <&clks IMXRT1050_CLK_SEMC>;
+			pinctrl-0 = <&pinctrl_semc>;
+			pinctrl-names = "default";
+			status = "okay";
+		};
+	};
+};
+
+&semc {
+	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;
  	};
  };
 
@@ -31,60 +82,143 @@
  };
 
  &gpio1 {
+	compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio";
  	u-boot,dm-spl;
  };
 
  &gpio2 {
+	compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio";
  	u-boot,dm-spl;
  };
 
  &gpio3 {
+	compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio";
  	u-boot,dm-spl;
  };
 
  &gpio4 {
+	compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio";
  	u-boot,dm-spl;
  };
 
  &gpio5 {
+	compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio";
  	u-boot,dm-spl;
  };
 

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

Quoted 10 lines
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +5 -1
-&gpt1 {
+&gpt {
+	clocks = <&osc>;
+	compatible = "fsl,imxrt-gpt";
+	status = "okay";
  	u-boot,dm-spl;
  };
 
  &lpuart1 { /* console */
+	compatible = "fsl,imxrt-lpuart";

As Jesse pointed me privately here you need to add:
clock-names = "per";
to be compatible with lpuart u-boot driver.

With that corrected it boots correctly.

But you also need to re-add the lcdif and usb* nodes here in -u-boot.dtsi file because lcdif and usb are supported in u-boot but still not in Linux.

Best regards

Signature · 2 lines
Giulio Benetti
CEO/CTO@Benetti Engineering sas
Quoted 720 lines
arch/arm/dts/imxrt1050-evk-u-boot.dtsi +93 -19
  	u-boot,dm-spl;
  };
 
-&semc {
+&iomuxc {
  	u-boot,dm-spl;
-
-	bank1: bank@0 {
+	compatible = "fsl,imxrt-iomuxc";
+	pinctrl-0 = <&pinctrl_lpuart1>;
+
+	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 */
+		>;
  		u-boot,dm-spl;
  	};
-};
-
-&iomuxc {
-	u-boot,dm-spl;
 
-	imxrt1050-evk {
+	pinctrl_lpuart1: lpuart1grp {
  		u-boot,dm-spl;
-		pinctrl_lpuart1: lpuart1grp {
-			u-boot,dm-spl;
-		};
-
-		pinctrl_semc: semcgrp {
-			u-boot,dm-spl;
-		};
+	};
 
-		pinctrl_usdhc0: usdhc0grp {
-			u-boot,dm-spl;
-		};
+	pinctrl_usdhc0: usdhc0grp {
+		u-boot,dm-spl;
  	};
-};
+ };
 
  &usdhc1 {
+	compatible = "fsl,imxrt-usdhc";
  	u-boot,dm-spl;
  };
arch/arm/dts/imxrt1050-evk.dts +31 -226
index fb2da3adfc..6a9c10decf 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 a29031ab3d..22c14a3262 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 09f4712af6..03e6a858a7 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 f74dbbcf93..93bef0832d 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

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

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v6.1-rc3.

---

Changes in v4:
- Re-synched with v6.1-rc3.

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                  | 240 ++-----
 arch/arm/dts/imx8ulp-pinfunc.h                |   4 +-
 arch/arm/dts/imx8ulp.dtsi                     | 594 +++++-------------
 include/dt-bindings/clock/imx8ulp-clock.h     |  53 +-
 include/dt-bindings/power/imx8ulp-power.h     |  26 +
 include/dt-bindings/reset/imx8ulp-pcc-reset.h |  59 ++
 7 files changed, 369 insertions(+), 622 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 7c1dab2acf..ad264f271e 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 +69 -171

279 lines not on this page · raw message

arch/arm/dts/imx8ulp-pinfunc.h +2 -2
index c21c3b644e..b204ac79b4 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 +171 -423

808 lines not on this page · raw message

include/dt-bindings/clock/imx8ulp-clock.h +32 -21

110 lines not on this page · raw message

include/dt-bindings/power/imx8ulp-power.h new file +26 -0
new file mode 100644
index 0000000000..a556b2e96d
@@ -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
#7 lore raw

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

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v6.1-rc3.

---

Changes in v4:
- Re-synched with v6.1-rc3.

 arch/arm/dts/imx8mq-evk.dts              |  43 +++++++
 arch/arm/dts/imx8mq-librem5-r3.dtsi      |  45 +++++++
 arch/arm/dts/imx8mq-librem5-r4.dts       |  20 +--
 arch/arm/dts/imx8mq-librem5.dtsi         | 153 +++++++++++++++++++++--
 arch/arm/dts/imx8mq-u-boot.dtsi          |  10 +-
 arch/arm/dts/imx8mq.dtsi                 |  19 +--
 include/dt-bindings/reset/imx8mq-reset.h |  61 ++++-----
 7 files changed, 281 insertions(+), 70 deletions(-)
 create mode 100644 arch/arm/dts/imx8mq-librem5-r3.dtsi
arch/arm/dts/imx8mq-evk.dts +43 -0
index 99fed35168..82387b9cb8 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-librem5-r3.dtsi new file +45 -0

45 lines not on this page · raw message

arch/arm/dts/imx8mq-librem5-r4.dts +6 -14
index cbfb49aa25..1056b7981b 100644
@@ -1,35 +1,27 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-// Copyright (C) 2020 Purism SPC <[email protected]>
+// Copyright (C) 2021 Purism SPC <[email protected]>
 
 /dts-v1/;
 
-#include "imx8mq-librem5.dtsi"
+#include "imx8mq-librem5-r3.dtsi"
 
 / {
 	model = "Purism Librem 5r4";
 	compatible = "purism,librem5r4", "purism,librem5", "fsl,imx8mq";
 };
 
-&accel_gyro {
-	mount-matrix =  "1",  "0",  "0",
-			"0",  "1",  "0",
-			"0",  "0", "-1";
-};
-
 &bat {
 	maxim,rsns-microohm = <1667>;
 };
 
-&bq25895 {
-	ti,battery-regulation-voltage = <4200000>; /* uV */
-	ti,charge-current = <1500000>; /* uA */
-	ti,termination-current = <144000>;  /* uA */
-};
-
 &led_backlight {
 	led-max-microamp = <25000>;
 };
 
+&lcd_panel {
+	compatible = "ys,ys57pss36bh5gq";
+};
+
 &proximity {
 	proximity-near-level = <10>;
 };
arch/arm/dts/imx8mq-librem5.dtsi +140 -13

261 lines not on this page · raw message

arch/arm/dts/imx8mq-u-boot.dtsi +5 -5
index c69c6cc58b..8d385e8da4 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 +10 -9
index 49eadb081b..19eaa52356 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 {
@@ -534,7 +534,7 @@
 				status = "disabled";
 			};
 
-			sdma2: sdma@302c0000 {
+			sdma2: dma-controller@302c0000 {
 				compatible = "fsl,imx8mq-sdma","fsl,imx7d-sdma";
 				reg = <0x302c0000 0x10000>;
 				interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
@@ -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 {
@@ -1301,7 +1302,7 @@
 				status = "disabled";
 			};
 
-			sdma1: sdma@30bd0000 {
+			sdma1: dma-controller@30bd0000 {
 				compatible = "fsl,imx8mq-sdma","fsl,imx7d-sdma";
 				reg = <0x30bd0000 0x10000>;
 				interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
@@ -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
#8 lore raw

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

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v6.1-rc3.

---

Changes in v4:
- Re-synched with v6.1-rc3.

 arch/arm/dts/imx8mp-dhcom-pdk2.dts            |  29 +-
 arch/arm/dts/imx8mp-dhcom-som.dtsi            |  20 +-
 arch/arm/dts/imx8mp-evk.dts                   | 179 +++++++----
 arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2.dts  |   2 +-
 arch/arm/dts/imx8mp-icore-mx8mp.dtsi          |   2 +-
 arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts   |  48 +--
 arch/arm/dts/imx8mp-u-boot.dtsi               |   2 +-
 arch/arm/dts/imx8mp-venice-gw74xx.dts         | 284 +++++++++++++-----
 arch/arm/dts/imx8mp-verdin.dtsi               |  32 +-
 arch/arm/dts/imx8mp.dtsi                      | 147 ++++++++-
 include/dt-bindings/clock/imx8mp-clock.h      |  13 +-
 include/dt-bindings/interconnect/fsl,imx8mp.h |  59 ++++
 include/dt-bindings/power/imx8mp-power.h      |  21 +-
 include/dt-bindings/reset/imx8mp-reset.h      |  50 +++
 14 files changed, 683 insertions(+), 205 deletions(-)
 create mode 100644 include/dt-bindings/interconnect/fsl,imx8mp.h
 create mode 100644 include/dt-bindings/reset/imx8mp-reset.h
arch/arm/dts/imx8mp-dhcom-pdk2.dts +20 -9
index c9a481ac9a..382fbedaf6 100644
@@ -17,14 +17,13 @@
 / {
 	model = "DH electronics i.MX8M Plus DHCOM Premium Developer Kit (2)";
 	compatible = "dh,imx8mp-dhcom-pdk2", "dh,imx8mp-dhcom-som",
-	             "fsl,imx8mp";
+		     "fsl,imx8mp";
 
 	chosen {
 		stdout-path = &uart1;
 	};
 
 	gpio-keys {
-		#size-cells = <0>;
 		compatible = "gpio-keys";
 
 		button-0 {
@@ -67,7 +66,7 @@
 	led {
 		compatible = "gpio-leds";
 
-		led-5 {
+		led-0 {
 			color = <LED_COLOR_ID_GREEN>;
 			default-state = "off";
 			function = LED_FUNCTION_INDICATOR;
@@ -76,7 +75,7 @@
 			pinctrl-names = "default";
 		};
 
-		led-6 {
+		led-1 {
 			color = <LED_COLOR_ID_GREEN>;
 			default-state = "off";
 			function = LED_FUNCTION_INDICATOR;
@@ -85,7 +84,7 @@
 			pinctrl-names = "default";
 		};
 
-		led-7 {
+		led-2 {
 			color = <LED_COLOR_ID_GREEN>;
 			default-state = "off";
 			function = LED_FUNCTION_INDICATOR;
@@ -94,7 +93,7 @@
 			pinctrl-names = "default";
 		};
 
-		led-8 {
+		led-3 {
 			color = <LED_COLOR_ID_GREEN>;
 			default-state = "off";
 			function = LED_FUNCTION_INDICATOR;
@@ -123,10 +122,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>;
@@ -143,7 +143,6 @@
 			txd2-skew-ps = <0>;
 			txd3-skew-ps = <0>;
 			txen-skew-ps = <0>;
-			max-speed = <100>;
 		};
 	};
 };
@@ -155,3 +154,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 197840d1a6..0f13ee3627 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 +124 -55

289 lines not on this page · raw message

arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2.dts +1 -1
index dd703b6a5e..a02b31c42d 100644
@@ -2,7 +2,7 @@
 /*
  * Copyright (c) 2018 NXP
  * Copyright (c) 2019 Engicam srl
- * Copyright (c) 2020 Amarula Solutons(India)
+ * Copyright (c) 2020 Amarula Solutions(India)
  */
 
 /dts-v1/;
arch/arm/dts/imx8mp-icore-mx8mp.dtsi +1 -1
index 5116079cce..a6319824ea 100644
@@ -2,7 +2,7 @@
 /*
  * Copyright (c) 2018 NXP
  * Copyright (c) 2019 Engicam srl
- * Copyright (c) 2020 Amarula Solutons(India)
+ * Copyright (c) 2020 Amarula Solutions(India)
  */
 
 / {
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 b5d640df7e..f9883aa133 100644
@@ -10,7 +10,7 @@
 	};
 };
 
-&{/soc@0} {
+&soc {
 	u-boot,dm-pre-reloc;
 	u-boot,dm-spl;
 };
arch/arm/dts/imx8mp-venice-gw74xx.dts +207 -77

493 lines not on this page · raw message

arch/arm/dts/imx8mp-verdin.dtsi +28 -4
index 68100a1726..7b712d1888 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,30 @@
 	};
 };
 
+&A53_0 {
+	cpu-supply = <&reg_vdd_arm>;
+};
+
+&A53_1 {
+	cpu-supply = <&reg_vdd_arm>;
+};
+
+&A53_2 {
+	cpu-supply = <&reg_vdd_arm>;
+};
+
+&A53_3 {
+	cpu-supply = <&reg_vdd_arm>;
+};
+
+&cpu_alert0 {
+	temperature = <95000>;
+};
+
+&cpu_crit0 {
+	temperature = <105000>;
+};
+
 /* Verdin SPI_1 */
 &ecspi1 {
 	#address-cells = <1>;
@@ -445,7 +469,7 @@
 				regulator-ramp-delay = <3125>;
 			};
 
-			BUCK2 {
+			reg_vdd_arm: BUCK2 {
 				nxp,dvs-run-voltage = <950000>;
 				nxp,dvs-standby-voltage = <850000>;
 				regulator-always-on;
@@ -619,7 +643,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 +720,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 +139 -8

249 lines not on this page · raw message

include/dt-bindings/clock/imx8mp-clock.h +8 -5
index e8d68fbb6e..9d5cc2ddde 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/interconnect/fsl,imx8mp.h new file +59 -0

59 lines not on this page · raw message

include/dt-bindings/power/imx8mp-power.h +17 -4
index 3f72bf7818..2fe3c2abad 100644
@@ -38,9 +38,22 @@
 #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
+#define IMX8MP_HDMIBLK_PD_HDCP				7
+#define IMX8MP_HDMIBLK_PD_HRV				8
+
+#define IMX8MP_VPUBLK_PD_G1				0
+#define IMX8MP_VPUBLK_PD_G2				1
+#define IMX8MP_VPUBLK_PD_VC8000E			2
 
 #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
#9 lore raw

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

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v6.1-rc3.

---

Changes in v4:
- Re-based after Adam's common imx8mn-u-boot device tree creation.
- Re-synched with v6.1-rc3.

 arch/arm/dts/imx8mn-beacon-baseboard.dtsi |  4 +-
 arch/arm/dts/imx8mn-evk.dtsi              | 45 ++++++++++++++++++++++-
 arch/arm/dts/imx8mn-var-som-symphony.dts  |  6 +--
 arch/arm/dts/imx8mn-venice-gw7902.dts     |  9 ++---
 arch/arm/dts/imx8mn.dtsi                  | 14 +++----
 include/dt-bindings/interconnect/imx8mn.h | 41 +++++++++++++++++++++
 6 files changed, 101 insertions(+), 18 deletions(-)
 create mode 100644 include/dt-bindings/interconnect/imx8mn.h
arch/arm/dts/imx8mn-beacon-baseboard.dtsi +2 -2
index 02f37dcda7..9e82069c94 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-evk.dtsi +44 -1

75 lines not on this page · raw message

arch/arm/dts/imx8mn-var-som-symphony.dts +3 -3
index f61c48776c..3ed7021a48 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 -5
index 367a232675..dd4302ac1d 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>;
@@ -213,7 +213,6 @@
 		compatible = "microchip,mcp2515";
 		reg = <0>;
 		clocks = <&can20m>;
-		oscillator-frequency = <20000000>;
 		interrupt-parent = <&gpio2>;
 		interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
 		spi-max-frequency = <10000000>;
arch/arm/dts/imx8mn.dtsi +7 -7
index e41e1d56f9..cb2836bfbd 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";
 				};
@@ -672,7 +672,6 @@
 							 <&clk IMX8MN_CLK_GPU_SHADER>,
 							 <&clk IMX8MN_CLK_GPU_BUS_ROOT>,
 							 <&clk IMX8MN_CLK_GPU_AHB>;
-						resets = <&src IMX8MQ_RESET_GPU_RESET>;
 					};
 
 					pgc_dispmix: power-domain@3 {
@@ -857,6 +856,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 +941,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 +955,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 +969,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
#10 lore raw

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

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Synchronise device tree with linux v6.1-rc3.

---

Changes in v4:
- Re-synched with v6.1-rc3.

 arch/arm/dts/imx8mm-beacon-baseboard.dtsi |  4 +-
 arch/arm/dts/imx8mm-evk.dtsi              | 43 +++++++++++++++++++
 arch/arm/dts/imx8mm-icore-mx8mm.dtsi      | 14 +++----
 arch/arm/dts/imx8mm-mx8menlo.dts          | 14 +++----
 arch/arm/dts/imx8mm-u-boot.dtsi           |  2 +-
 arch/arm/dts/imx8mm-venice-gw700x.dtsi    | 24 +++++------
 arch/arm/dts/imx8mm-venice-gw7901.dts     | 12 ++++--
 arch/arm/dts/imx8mm-venice-gw7902.dts     | 14 +++----
 arch/arm/dts/imx8mm-venice-gw7903.dts     |  6 +--
 arch/arm/dts/imx8mm-venice-gw7904.dts     |  4 ++
 arch/arm/dts/imx8mm-verdin.dtsi           | 50 +++++++++++++++++------
 include/dt-bindings/interconnect/imx8mm.h | 50 +++++++++++++++++++++++
 12 files changed, 179 insertions(+), 58 deletions(-)
 create mode 100644 include/dt-bindings/interconnect/imx8mm.h
arch/arm/dts/imx8mm-beacon-baseboard.dtsi +2 -2
index f338a886d8..03266bd90a 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 +7 -7
index b40148d728..def7bb5d37 100644
@@ -2,7 +2,7 @@
 /*
  * Copyright (c) 2018 NXP
  * Copyright (c) 2019 Engicam srl
- * Copyright (c) 2020 Amarula Solutons(India)
+ * Copyright (c) 2020 Amarula Solutions(India)
  */
 
 / {
@@ -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 +7 -7
index 92eaf4ef45..32f6f2f50c 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";
@@ -152,11 +152,11 @@
 	 * CPLD_reset is RESET_SOFT in schematic
 	 */
 	gpio-line-names =
-		"CPLD_D[1]", "CPLD_int", "CPLD_reset", "",
-		"", "CPLD_D[0]", "", "",
-		"", "", "", "CPLD_D[2]",
-		"CPLD_D[3]", "CPLD_D[4]", "CPLD_D[5]", "CPLD_D[6]",
-		"CPLD_D[7]", "", "", "",
+		"CPLD_D[6]", "CPLD_int", "CPLD_reset", "",
+		"", "CPLD_D[7]", "", "",
+		"", "", "", "CPLD_D[5]",
+		"CPLD_D[4]", "CPLD_D[3]", "CPLD_D[2]", "CPLD_D[1]",
+		"CPLD_D[0]", "", "", "",
 		"", "", "", "",
 		"", "", "", "KBD_intK",
 		"", "", "", "";
arch/arm/dts/imx8mm-u-boot.dtsi +1 -1
index a5e30f7994..60d49bc3d7 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 00f86cada3..66a0d103c9 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 +8 -4
index 24737e8903..d3ee6fc4ba 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>;
@@ -626,24 +626,28 @@
 			lan1: port@0 {
 				reg = <0>;
 				label = "lan1";
+				phy-mode = "internal";
 				local-mac-address = [00 00 00 00 00 00];
 			};
 
 			lan2: port@1 {
 				reg = <1>;
 				label = "lan2";
+				phy-mode = "internal";
 				local-mac-address = [00 00 00 00 00 00];
 			};
 
 			lan3: port@2 {
 				reg = <2>;
 				label = "lan3";
+				phy-mode = "internal";
 				local-mac-address = [00 00 00 00 00 00];
 			};
 
 			lan4: port@3 {
 				reg = <3>;
 				label = "lan4";
+				phy-mode = "internal";
 				local-mac-address = [00 00 00 00 00 00];
 			};
 
arch/arm/dts/imx8mm-venice-gw7902.dts +5 -9
index 8e8d0d34c2..31f4c735fe 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>;
@@ -222,7 +222,6 @@
 		compatible = "microchip,mcp2515";
 		reg = <0>;
 		clocks = <&can20m>;
-		oscillator-frequency = <20000000>;
 		interrupt-parent = <&gpio2>;
 		interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
 		spi-max-frequency = <10000000>;
@@ -651,7 +650,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";
 };
@@ -742,9 +741,6 @@
 			MX8MM_IOMUXC_GPIO1_IO13_GPIO1_IO13	0x40000041 /* M2_RESET */
 			MX8MM_IOMUXC_NAND_DATA01_GPIO3_IO7	0x40000119 /* M2_OFF# */
 			MX8MM_IOMUXC_GPIO1_IO15_GPIO1_IO15	0x40000159 /* M2_WDIS# */
-			MX8MM_IOMUXC_SAI1_TXD6_GPIO4_IO18       0x40000041 /* LTE_INT */
-			MX8MM_IOMUXC_SAI1_TXD5_GPIO4_IO17       0x40000041 /* LTE_RST# */
-			MX8MM_IOMUXC_SAI1_TXD4_GPIO4_IO16       0x40000041 /* LTE_PWR */
 			MX8MM_IOMUXC_SAI1_TXD2_GPIO4_IO14	0x40000041 /* AMP GPIO1 */
 			MX8MM_IOMUXC_SAI1_TXD0_GPIO4_IO12	0x40000041 /* AMP GPIO2 */
 			MX8MM_IOMUXC_SAI1_TXC_GPIO4_IO11	0x40000041 /* AMP GPIO3 */
arch/arm/dts/imx8mm-venice-gw7903.dts +3 -3
index 1b69ac0e12..19f6d2943d 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-venice-gw7904.dts +4 -0
index 2b68fb3e43..a67771d021 100644
@@ -617,6 +617,10 @@
 	status = "okay";
 };
 
+&pgc_mipi {
+	status = "disabled";
+};
+
 /* off-board RS232 */
 &uart1 {
 	pinctrl-names = "default";
arch/arm/dts/imx8mm-verdin.dtsi +37 -13

118 lines not on this page · raw message

include/dt-bindings/interconnect/imx8mm.h new file +50 -0

50 lines not on this page · raw message

Signature · 1 line
2.35.1
Tested-by on the v4 series
#11 lore raw
In reply to Marcel Ziswiler
Quoted 109 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

This series synchronises them imx device trees with the upstream Linux kernel (v6.1-rc3). 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 v4:
- Re-synched with v6.1-rc3 which now already contains the recent DDR pinmux addition.
- Re-named commit subject and re-worded commit message to indicate migration to automatic build system included -u-boot.dtsi device tree include files. Thanks to Giulio for pointing this out.
- Use imxrt1050-evk-u-boot.dtsi as provided/tested by Jesse.
- Explain intent in commit message as pointed out by Giulio.
- Re-synched with v6.1-rc3.
- Re-based after Adam's common imx8mn-u-boot device tree creation.

Changes in v3:
- Incorporate feedback from Jesse.

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: migrate to build system included -u-boot.dtsi
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          |  14 +-
 arch/arm/dts/imx8mm-mx8menlo.dts              |  14 +-
 arch/arm/dts/imx8mm-u-boot.dtsi               |   2 +-
 arch/arm/dts/imx8mm-venice-gw700x.dtsi        |  24 +-
 arch/arm/dts/imx8mm-venice-gw7901.dts         |  12 +-
 arch/arm/dts/imx8mm-venice-gw7902.dts         |  14 +-
 arch/arm/dts/imx8mm-venice-gw7903.dts         |   6 +-
 arch/arm/dts/imx8mm-venice-gw7904.dts         |   4 +
 arch/arm/dts/imx8mm-verdin.dtsi               |  50 +-
 arch/arm/dts/imx8mn-beacon-baseboard.dtsi     |   4 +-
 arch/arm/dts/imx8mn-evk.dtsi                  |  45 +-
 arch/arm/dts/imx8mn-var-som-symphony.dts      |   6 +-
 arch/arm/dts/imx8mn-venice-gw7902.dts         |   9 +-
 arch/arm/dts/imx8mn.dtsi                      |  14 +-
 arch/arm/dts/imx8mp-dhcom-pdk2.dts            |  29 +-
 arch/arm/dts/imx8mp-dhcom-som.dtsi            |  20 +-
 arch/arm/dts/imx8mp-evk.dts                   | 179 ++++--
 arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2.dts  |   2 +-
 arch/arm/dts/imx8mp-icore-mx8mp.dtsi          |   2 +-
 arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts   |  48 +-
 arch/arm/dts/imx8mp-u-boot.dtsi               |   2 +-
 arch/arm/dts/imx8mp-venice-gw74xx.dts         | 284 ++++++---
 arch/arm/dts/imx8mp-verdin.dtsi               |  32 +-
 arch/arm/dts/imx8mp.dtsi                      | 147 ++++-
 arch/arm/dts/imx8mq-evk.dts                   |  43 ++
 arch/arm/dts/imx8mq-librem5-r3.dtsi           |  45 ++
 arch/arm/dts/imx8mq-librem5-r4.dts            |  20 +-
 arch/arm/dts/imx8mq-librem5.dtsi              | 153 ++++-
 arch/arm/dts/imx8mq-u-boot.dtsi               |  10 +-
 arch/arm/dts/imx8mq.dtsi                      |  19 +-
 arch/arm/dts/imx8ulp-evk-u-boot.dtsi          |  15 +-
 arch/arm/dts/imx8ulp-evk.dts                  | 240 ++-----
 arch/arm/dts/imx8ulp-pinfunc.h                |   4 +-
 arch/arm/dts/imx8ulp.dtsi                     | 594 +++++-------------
 arch/arm/dts/imxrt1020-evk-u-boot.dtsi        |   7 +-
 arch/arm/dts/imxrt1020-evk.dts                |   1 -
 arch/arm/dts/imxrt1050-evk-u-boot.dtsi        | 174 ++++-
 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     |  53 +-
 include/dt-bindings/clock/imxrt1050-clock.h   |   9 +-
 include/dt-bindings/interconnect/fsl,imx8mp.h |  59 ++
 include/dt-bindings/interconnect/imx8mm.h     |  50 ++
 include/dt-bindings/interconnect/imx8mn.h     |  41 ++
 include/dt-bindings/power/imx8mp-power.h      |  21 +-
 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 ++
 54 files changed, 1881 insertions(+), 1325 deletions(-)
 create mode 100644 arch/arm/dts/imx8mq-librem5-r3.dtsi
 create mode 100644 include/dt-bindings/interconnect/fsl,imx8mp.h
 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
Quoted 3 lines

--
2.35.1

Marcel,

Thanks for refreshing this. I've tested the various venice boards and did not find any issues.

Out of curiosity, what is 'part2' going to be about?

Stefano, it would be nice to see these merged in your next tree so others can base their dt patches off of them to avoid collisions.

Best Regards,

Tim

#12 lore raw

Hi Tim, Marcel,

Quoted 119 lines · Tim Harvey
Quoted 109 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

This series synchronises them imx device trees with the upstream Linux kernel (v6.1-rc3). 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 v4:
- Re-synched with v6.1-rc3 which now already contains the recent DDR pinmux addition.
- Re-named commit subject and re-worded commit message to indicate migration to automatic build system included -u-boot.dtsi device tree include files. Thanks to Giulio for pointing this out.
- Use imxrt1050-evk-u-boot.dtsi as provided/tested by Jesse.
- Explain intent in commit message as pointed out by Giulio.
- Re-synched with v6.1-rc3.
- Re-based after Adam's common imx8mn-u-boot device tree creation.

Changes in v3:
- Incorporate feedback from Jesse.

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: migrate to build system included -u-boot.dtsi
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          |  14 +-
  arch/arm/dts/imx8mm-mx8menlo.dts              |  14 +-
  arch/arm/dts/imx8mm-u-boot.dtsi               |   2 +-
  arch/arm/dts/imx8mm-venice-gw700x.dtsi        |  24 +-
  arch/arm/dts/imx8mm-venice-gw7901.dts         |  12 +-
  arch/arm/dts/imx8mm-venice-gw7902.dts         |  14 +-
  arch/arm/dts/imx8mm-venice-gw7903.dts         |   6 +-
  arch/arm/dts/imx8mm-venice-gw7904.dts         |   4 +
  arch/arm/dts/imx8mm-verdin.dtsi               |  50 +-
  arch/arm/dts/imx8mn-beacon-baseboard.dtsi     |   4 +-
  arch/arm/dts/imx8mn-evk.dtsi                  |  45 +-
  arch/arm/dts/imx8mn-var-som-symphony.dts      |   6 +-
  arch/arm/dts/imx8mn-venice-gw7902.dts         |   9 +-
  arch/arm/dts/imx8mn.dtsi                      |  14 +-
  arch/arm/dts/imx8mp-dhcom-pdk2.dts            |  29 +-
  arch/arm/dts/imx8mp-dhcom-som.dtsi            |  20 +-
  arch/arm/dts/imx8mp-evk.dts                   | 179 ++++--
  arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2.dts  |   2 +-
  arch/arm/dts/imx8mp-icore-mx8mp.dtsi          |   2 +-
  arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts   |  48 +-
  arch/arm/dts/imx8mp-u-boot.dtsi               |   2 +-
  arch/arm/dts/imx8mp-venice-gw74xx.dts         | 284 ++++++---
  arch/arm/dts/imx8mp-verdin.dtsi               |  32 +-
  arch/arm/dts/imx8mp.dtsi                      | 147 ++++-
  arch/arm/dts/imx8mq-evk.dts                   |  43 ++
  arch/arm/dts/imx8mq-librem5-r3.dtsi           |  45 ++
  arch/arm/dts/imx8mq-librem5-r4.dts            |  20 +-
  arch/arm/dts/imx8mq-librem5.dtsi              | 153 ++++-
  arch/arm/dts/imx8mq-u-boot.dtsi               |  10 +-
  arch/arm/dts/imx8mq.dtsi                      |  19 +-
  arch/arm/dts/imx8ulp-evk-u-boot.dtsi          |  15 +-
  arch/arm/dts/imx8ulp-evk.dts                  | 240 ++-----
  arch/arm/dts/imx8ulp-pinfunc.h                |   4 +-
  arch/arm/dts/imx8ulp.dtsi                     | 594 +++++-------------
  arch/arm/dts/imxrt1020-evk-u-boot.dtsi        |   7 +-
  arch/arm/dts/imxrt1020-evk.dts                |   1 -
  arch/arm/dts/imxrt1050-evk-u-boot.dtsi        | 174 ++++-
  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     |  53 +-
  include/dt-bindings/clock/imxrt1050-clock.h   |   9 +-
  include/dt-bindings/interconnect/fsl,imx8mp.h |  59 ++
  include/dt-bindings/interconnect/imx8mm.h     |  50 ++
  include/dt-bindings/interconnect/imx8mn.h     |  41 ++
  include/dt-bindings/power/imx8mp-power.h      |  21 +-
  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 ++
  54 files changed, 1881 insertions(+), 1325 deletions(-)

create mode 100644 arch/arm/dts/imx8mq-librem5-r3.dtsi create mode 100644 include/dt-bindings/interconnect/fsl,imx8mp.h 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

Quoted 3 lines

--
2.35.1

Marcel,

Thanks for refreshing this. I've tested the various venice boards and did not find any issues.

Quoted 7 lines

Out of curiosity, what is 'part2' going to be about?

Stefano, it would be nice to see these merged in your next tree so others can base their dt patches off of them to avoid collisions.

Sure - I will apply these with exception of imxrt, that need some rework.

Stefano

Quoted 3 lines

Best Regards,

Tim

#13 lore raw

Hi Stefano

Quoted 124 lines · Stefano Babic

Hi Tim, Marcel,

Quoted 121 lines · Tim Harvey
Quoted 109 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

This series synchronises them imx device trees with the upstream Linux kernel (v6.1-rc3). 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 v4:
- Re-synched with v6.1-rc3 which now already contains the recent DDR pinmux addition.
- Re-named commit subject and re-worded commit message to indicate migration to automatic build system included -u-boot.dtsi device tree include files. Thanks to Giulio for pointing this out.
- Use imxrt1050-evk-u-boot.dtsi as provided/tested by Jesse.
- Explain intent in commit message as pointed out by Giulio.
- Re-synched with v6.1-rc3.
- Re-based after Adam's common imx8mn-u-boot device tree creation.

Changes in v3:
- Incorporate feedback from Jesse.

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: migrate to build system included -u-boot.dtsi
   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          |  14 +- arch/arm/dts/imx8mm-mx8menlo.dts              |  14 +- arch/arm/dts/imx8mm-u-boot.dtsi               |   2 +- arch/arm/dts/imx8mm-venice-gw700x.dtsi        |  24 +-

  arch/arm/dts/imx8mm-venice-gw7901.dts         |  12 +-
  arch/arm/dts/imx8mm-venice-gw7902.dts         |  14 +-
  arch/arm/dts/imx8mm-venice-gw7903.dts         |   6 +-
  arch/arm/dts/imx8mm-venice-gw7904.dts         |   4 +

  arch/arm/dts/imx8mm-verdin.dtsi               |  50 +- arch/arm/dts/imx8mn-beacon-baseboard.dtsi     |   4 +- arch/arm/dts/imx8mn-evk.dtsi                  |  45 +- arch/arm/dts/imx8mn-var-som-symphony.dts      |   6 +- arch/arm/dts/imx8mn-venice-gw7902.dts         |   9 +- arch/arm/dts/imx8mn.dtsi                      |  14 +- arch/arm/dts/imx8mp-dhcom-pdk2.dts            |  29 +- arch/arm/dts/imx8mp-dhcom-som.dtsi            |  20 +- arch/arm/dts/imx8mp-evk.dts                   | 179 ++++-- arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2.dts  |   2 +- arch/arm/dts/imx8mp-icore-mx8mp.dtsi          |   2 +- arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts   |  48 +- arch/arm/dts/imx8mp-u-boot.dtsi               |   2 +- arch/arm/dts/imx8mp-venice-gw74xx.dts         | 284 ++++++--- arch/arm/dts/imx8mp-verdin.dtsi               |  32 +- arch/arm/dts/imx8mp.dtsi                      | 147 ++++- arch/arm/dts/imx8mq-evk.dts                   |  43 ++ arch/arm/dts/imx8mq-librem5-r3.dtsi           |  45 ++ arch/arm/dts/imx8mq-librem5-r4.dts            |  20 +- arch/arm/dts/imx8mq-librem5.dtsi              | 153 ++++- arch/arm/dts/imx8mq-u-boot.dtsi               |  10 +- arch/arm/dts/imx8mq.dtsi                      |  19 +- arch/arm/dts/imx8ulp-evk-u-boot.dtsi          |  15 +- arch/arm/dts/imx8ulp-evk.dts                  | 240 ++----- arch/arm/dts/imx8ulp-pinfunc.h                |   4 +- arch/arm/dts/imx8ulp.dtsi                     | 594 +++++------------- arch/arm/dts/imxrt1020-evk-u-boot.dtsi        |   7 +- arch/arm/dts/imxrt1020-evk.dts                |   1 - arch/arm/dts/imxrt1050-evk-u-boot.dtsi        | 174 ++++- 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     |  53 +- include/dt-bindings/clock/imxrt1050-clock.h   |   9 +- include/dt-bindings/interconnect/fsl,imx8mp.h |  59 ++ include/dt-bindings/interconnect/imx8mm.h     |  50 ++ include/dt-bindings/interconnect/imx8mn.h     |  41 ++ include/dt-bindings/power/imx8mp-power.h      |  21 +- 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 ++

  54 files changed, 1881 insertions(+), 1325 deletions(-)

  create mode 100644 arch/arm/dts/imx8mq-librem5-r3.dtsi create mode 100644 include/dt-bindings/interconnect/fsl,imx8mp.h 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

Quoted 3 lines

--
2.35.1

Marcel,

Thanks for refreshing this. I've tested the various venice boards and did not find any issues.

Quoted 7 lines
Quoted 5 lines

Out of curiosity, what is 'part2' going to be about?

Stefano, it would be nice to see these merged in your next tree so others can base their dt patches off of them to avoid collisions.

Sure - I will apply these with exception of imxrt, that need some rework.

Now that you are there I will send a v5 with all of it corrected ASAP aka give me 5-10 minutes. Thanks!

Quoted 5 lines

Stefano

Quoted 3 lines

Best Regards,

Tim

Cheers

Marcel

#14 lore raw

Hi Marcel,

Quoted 129 lines · Marcel Ziswiler

Hi Stefano

Quoted 126 lines · Stefano Babic

Hi Tim, Marcel,

Quoted 123 lines · Tim Harvey
Quoted 109 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

This series synchronises them imx device trees with the upstream Linux kernel (v6.1-rc3). 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 v4:
- Re-synched with v6.1-rc3 which now already contains the recent DDR pinmux addition.
- Re-named commit subject and re-worded commit message to indicate migration to automatic build system included -u-boot.dtsi device tree include files. Thanks to Giulio for pointing this out.
- Use imxrt1050-evk-u-boot.dtsi as provided/tested by Jesse.
- Explain intent in commit message as pointed out by Giulio.
- Re-synched with v6.1-rc3.
- Re-based after Adam's common imx8mn-u-boot device tree creation.

Changes in v3:
- Incorporate feedback from Jesse.

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: migrate to build system included -u-boot.dtsi
   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          |  14 +-
   arch/arm/dts/imx8mm-mx8menlo.dts              |  14 +-
   arch/arm/dts/imx8mm-u-boot.dtsi               |   2 +-
   arch/arm/dts/imx8mm-venice-gw700x.dtsi        |  24 +-
   arch/arm/dts/imx8mm-venice-gw7901.dts         |  12 +-
   arch/arm/dts/imx8mm-venice-gw7902.dts         |  14 +-
   arch/arm/dts/imx8mm-venice-gw7903.dts         |   6 +-
   arch/arm/dts/imx8mm-venice-gw7904.dts         |   4 +
   arch/arm/dts/imx8mm-verdin.dtsi               |  50 +-
   arch/arm/dts/imx8mn-beacon-baseboard.dtsi     |   4 +-
   arch/arm/dts/imx8mn-evk.dtsi                  |  45 +-
   arch/arm/dts/imx8mn-var-som-symphony.dts      |   6 +-
   arch/arm/dts/imx8mn-venice-gw7902.dts         |   9 +-
   arch/arm/dts/imx8mn.dtsi                      |  14 +-
   arch/arm/dts/imx8mp-dhcom-pdk2.dts            |  29 +-
   arch/arm/dts/imx8mp-dhcom-som.dtsi            |  20 +-
   arch/arm/dts/imx8mp-evk.dts                   | 179 ++++--
   arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2.dts  |   2 +-
   arch/arm/dts/imx8mp-icore-mx8mp.dtsi          |   2 +-
   arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts   |  48 +-
   arch/arm/dts/imx8mp-u-boot.dtsi               |   2 +-
   arch/arm/dts/imx8mp-venice-gw74xx.dts         | 284 ++++++---
   arch/arm/dts/imx8mp-verdin.dtsi               |  32 +-
   arch/arm/dts/imx8mp.dtsi                      | 147 ++++-
   arch/arm/dts/imx8mq-evk.dts                   |  43 ++
   arch/arm/dts/imx8mq-librem5-r3.dtsi           |  45 ++
   arch/arm/dts/imx8mq-librem5-r4.dts            |  20 +-
   arch/arm/dts/imx8mq-librem5.dtsi              | 153 ++++-
   arch/arm/dts/imx8mq-u-boot.dtsi               |  10 +-
   arch/arm/dts/imx8mq.dtsi                      |  19 +-
   arch/arm/dts/imx8ulp-evk-u-boot.dtsi          |  15 +-
   arch/arm/dts/imx8ulp-evk.dts                  | 240 ++-----
   arch/arm/dts/imx8ulp-pinfunc.h                |   4 +-
   arch/arm/dts/imx8ulp.dtsi                     | 594 +++++-------------
   arch/arm/dts/imxrt1020-evk-u-boot.dtsi        |   7 +-
   arch/arm/dts/imxrt1020-evk.dts                |   1 -
   arch/arm/dts/imxrt1050-evk-u-boot.dtsi        | 174 ++++-
   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     |  53 +-
   include/dt-bindings/clock/imxrt1050-clock.h   |   9 +-
   include/dt-bindings/interconnect/fsl,imx8mp.h |  59 ++
   include/dt-bindings/interconnect/imx8mm.h     |  50 ++
   include/dt-bindings/interconnect/imx8mn.h     |  41 ++
   include/dt-bindings/power/imx8mp-power.h      |  21 +-
   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 ++
   54 files changed, 1881 insertions(+), 1325 deletions(-)

  create mode 100644 arch/arm/dts/imx8mq-librem5-r3.dtsi create mode 100644 include/dt-bindings/interconnect/fsl,imx8mp.h 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

Quoted 3 lines

--
2.35.1

Marcel,

Thanks for refreshing this. I've tested the various venice boards and did not find any issues.

Out of curiosity, what is 'part2' going to be about?

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

Stefano, it would be nice to see these merged in your next tree so others can base their dt patches off of them to avoid collisions.

Sure - I will apply these with exception of imxrt, that need some rework.

Now that you are there I will send a v5 with all of it corrected ASAP aka give me 5-10 minutes. Thanks!

Fine with me - I just check CI for build breakages.

Stefano

Quoted 9 lines
Quoted 5 lines

Stefano

Quoted 3 lines

Best Regards,

Tim

Cheers

Marcel

#15 lore raw
In reply to Tim Harvey

Hi Tim

Quoted 114 lines · Tim Harvey
Quoted 109 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

This series synchronises them imx device trees with the upstream Linux kernel (v6.1-rc3). 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 v4:
- Re-synched with v6.1-rc3 which now already contains the recent DDR pinmux addition.
- Re-named commit subject and re-worded commit message to indicate migration to automatic build system included -u-boot.dtsi device tree include files. Thanks to Giulio for pointing this out.
- Use imxrt1050-evk-u-boot.dtsi as provided/tested by Jesse.
- Explain intent in commit message as pointed out by Giulio.
- Re-synched with v6.1-rc3.
- Re-based after Adam's common imx8mn-u-boot device tree creation.

Changes in v3:
- Incorporate feedback from Jesse.

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: migrate to build system included -u-boot.dtsi
  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          |  14 +- arch/arm/dts/imx8mm-mx8menlo.dts              |  14 +- arch/arm/dts/imx8mm-u-boot.dtsi               |   2 +- arch/arm/dts/imx8mm-venice-gw700x.dtsi        |  24 +-

 arch/arm/dts/imx8mm-venice-gw7901.dts         |  12 +-
 arch/arm/dts/imx8mm-venice-gw7902.dts         |  14 +-
 arch/arm/dts/imx8mm-venice-gw7903.dts         |   6 +-
 arch/arm/dts/imx8mm-venice-gw7904.dts         |   4 +

 arch/arm/dts/imx8mm-verdin.dtsi               |  50 +- arch/arm/dts/imx8mn-beacon-baseboard.dtsi     |   4 +- arch/arm/dts/imx8mn-evk.dtsi                  |  45 +- arch/arm/dts/imx8mn-var-som-symphony.dts      |   6 +- arch/arm/dts/imx8mn-venice-gw7902.dts         |   9 +- arch/arm/dts/imx8mn.dtsi                      |  14 +- arch/arm/dts/imx8mp-dhcom-pdk2.dts            |  29 +- arch/arm/dts/imx8mp-dhcom-som.dtsi            |  20 +- arch/arm/dts/imx8mp-evk.dts                   | 179 ++++-- arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2.dts  |   2 +- arch/arm/dts/imx8mp-icore-mx8mp.dtsi          |   2 +- arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts   |  48 +- arch/arm/dts/imx8mp-u-boot.dtsi               |   2 +- arch/arm/dts/imx8mp-venice-gw74xx.dts         | 284 ++++++--- arch/arm/dts/imx8mp-verdin.dtsi               |  32 +- arch/arm/dts/imx8mp.dtsi                      | 147 ++++- arch/arm/dts/imx8mq-evk.dts                   |  43 ++ arch/arm/dts/imx8mq-librem5-r3.dtsi           |  45 ++ arch/arm/dts/imx8mq-librem5-r4.dts            |  20 +- arch/arm/dts/imx8mq-librem5.dtsi              | 153 ++++- arch/arm/dts/imx8mq-u-boot.dtsi               |  10 +- arch/arm/dts/imx8mq.dtsi                      |  19 +- arch/arm/dts/imx8ulp-evk-u-boot.dtsi          |  15 +- arch/arm/dts/imx8ulp-evk.dts                  | 240 ++----- arch/arm/dts/imx8ulp-pinfunc.h                |   4 +- arch/arm/dts/imx8ulp.dtsi                     | 594 +++++------------- arch/arm/dts/imxrt1020-evk-u-boot.dtsi        |   7 +- arch/arm/dts/imxrt1020-evk.dts                |   1 - arch/arm/dts/imxrt1050-evk-u-boot.dtsi        | 174 ++++- 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     |  53 +- include/dt-bindings/clock/imxrt1050-clock.h   |   9 +- include/dt-bindings/interconnect/fsl,imx8mp.h |  59 ++ include/dt-bindings/interconnect/imx8mm.h     |  50 ++ include/dt-bindings/interconnect/imx8mn.h     |  41 ++ include/dt-bindings/power/imx8mp-power.h      |  21 +- 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 ++

 54 files changed, 1881 insertions(+), 1325 deletions(-)

 create mode 100644 arch/arm/dts/imx8mq-librem5-r3.dtsi create mode 100644 include/dt-bindings/interconnect/fsl,imx8mp.h 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

Quoted 3 lines

--
2.35.1

Quoted 6 lines

Marcel,

Thanks for refreshing this. I've tested the various venice boards and did not find any issues.

Thanks!

Quoted 1 line

Out of curiosity, what is 'part2' going to be about?

Part 2 got already applied [1].

Quoted 6 lines

Stefano, it would be nice to see these merged in your next tree so others can base their dt patches off of them to avoid collisions.

Best Regards,

Tim

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

Cheers

Marcel