Skip to contentSkip to conversation

ARM: dts: imxrt1050: Migrate to OF_UPSTREAM

PATCH Superseded Jesse Taube 3 participants 3 messages Jan 17, 2025

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: dts: imxrt1050: Migrate to OF_UPSTREAM

The device tree for imxrt1050 is now
available in the /dts/upstream directory.
Migrate board to use OF_UPSTREAM.

---
Please note /dts/upstream still needs to be updated the upstream commit is 5f122030061db3e5d2bddd9cf5c583deaa6c54ff

---
 arch/arm/dts/imxrt1050-evk.dts       |  72 --
 arch/arm/dts/imxrt1050-pinfunc.h     | 993 ---------------------------
 arch/arm/dts/imxrt1050.dtsi          | 160 -----
 configs/imxrt1050-evk_defconfig      |   3 +-
 configs/imxrt1050-evk_fspi_defconfig |   3 +-
 5 files changed, 4 insertions(+), 1227 deletions(-)
 delete mode 100644 arch/arm/dts/imxrt1050-evk.dts
 delete mode 100644 arch/arm/dts/imxrt1050-pinfunc.h
 delete mode 100644 arch/arm/dts/imxrt1050.dtsi
arch/arm/dts/imxrt1050-evk.dts deleted +0 -72
deleted file mode 100644
index 6a9c10decf5..00000000000
@@ -1,72 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (C) 2019
- * Author(s): Giulio Benetti <[email protected]>
- */
-
-/dts-v1/;
-#include "imxrt1050.dtsi"
-#include "imxrt1050-pinfunc.h"
-
-/ {
-	model = "NXP IMXRT1050-evk board";
-	compatible = "fsl,imxrt1050-evk", "fsl,imxrt1050";
-
-	chosen {
-		stdout-path = &lpuart1;
-	};
-
-	aliases {
-		gpio0 = &gpio1;
-		gpio1 = &gpio2;
-		gpio2 = &gpio3;
-		gpio3 = &gpio4;
-		gpio4 = &gpio5;
-		mmc0 = &usdhc1;
-		serial0 = &lpuart1;
-	};
-
-	memory@80000000 {
-		device_type = "memory";
-		reg = <0x80000000 0x2000000>;
-	};
-};
-
-&lpuart1 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_lpuart1>;
-	status = "okay";
-};
-
-&iomuxc {
-	pinctrl-names = "default";
-	pinctrl_lpuart1: lpuart1grp {
-		fsl,pins = <
-			MXRT1050_IOMUXC_GPIO_AD_B0_12_LPUART1_TXD	0xf1
-			MXRT1050_IOMUXC_GPIO_AD_B0_13_LPUART1_RXD	0xf1
-		>;
-	};
-
-	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 {
-	pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep";
-	pinctrl-0 = <&pinctrl_usdhc0>;
-	pinctrl-1 = <&pinctrl_usdhc0>;
-	pinctrl-2 = <&pinctrl_usdhc0>;
-	pinctrl-3 = <&pinctrl_usdhc0>;
-	cd-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;
-	status = "okay";
-};
arch/arm/dts/imxrt1050-pinfunc.h deleted +0 -993

993 lines not on this page · raw message

arch/arm/dts/imxrt1050.dtsi deleted +0 -160

160 lines not on this page · raw message

configs/imxrt1050-evk_defconfig +2 -1
index b488ff1b7da..918713a1c7d 100644
@@ -13,7 +13,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20020000
 CONFIG_ENV_OFFSET=0x80000
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="imxrt1050-evk"
+CONFIG_DEFAULT_DEVICE_TREE="nxp/imx/imxrt1050-evk"
 CONFIG_TARGET_IMXRT1050_EVK=y
 CONFIG_SPL_MMC=y
 CONFIG_SPL_SERIAL=y
@@ -48,6 +48,7 @@ CONFIG_CMD_USB=y
 # CONFIG_EFI_PARTITION is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
+CONFIG_OF_UPSTREAM=y
 CONFIG_ENV_IS_NOWHERE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
configs/imxrt1050-evk_fspi_defconfig +2 -1
index 5d58e723a70..86acd158391 100644
@@ -15,7 +15,7 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20020000
 CONFIG_ENV_OFFSET=0x80000
 CONFIG_IMX_CONFIG="board/freescale/imxrt1050-evk/imximage-nor.cfg"
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="imxrt1050-evk"
+CONFIG_DEFAULT_DEVICE_TREE="nxp/imx/imxrt1050-evk"
 CONFIG_TARGET_IMXRT1050_EVK=y
 CONFIG_SPL_MMC=y
 CONFIG_SPL_SERIAL=y
@@ -50,6 +50,7 @@ CONFIG_CMD_USB=y
 # CONFIG_EFI_PARTITION is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
+CONFIG_OF_UPSTREAM=y
 CONFIG_ENV_IS_NOWHERE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
Signature · 1 line
2.45.2
#1 lore raw
Quoted 11 lines

Subject: [PATCH] ARM: dts: imxrt1050: Migrate to OF_UPSTREAM

The device tree for imxrt1050 is now available in the /dts/upstream directory. Migrate board to use OF_UPSTREAM.

---
Please note /dts/upstream still needs to be updated the upstream commit is 5f122030061db3e5d2bddd9cf5c583deaa6c54ff

You might need to update the dts/upstream to make
this patch in.

Regards
Peng

#2 lore raw
Quoted 6 lines · Peng Fan
Quoted 6 lines

Subject: [PATCH] ARM: dts: imxrt1050: Migrate to OF_UPSTREAM

The device tree for imxrt1050 is now available in the /dts/upstream directory. Migrate board to use OF_UPSTREAM.

Quoted 8 lines
Quoted 5 lines

---
Please note /dts/upstream still needs to be updated the upstream commit is 5f122030061db3e5d2bddd9cf5c583deaa6c54ff

You might need to update the dts/upstream to make
this patch in.

Yes, you either need to wait for the next re-sync or to send the cherry-pick as well, see
https://docs.u-boot.org/en/latest/develop/devicetree/control.html#resyncing-with-devicetree-rebasing
Thanks!

Signature · 1 line
Tom