]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
imx8mm: icore-mx8mm: Switch to OF_UPSTREAM
authorPeng Fan <peng.fan@nxp.com>
Mon, 18 May 2026 02:18:10 +0000 (10:18 +0800)
committerFabio Estevam <festevam@gmail.com>
Fri, 5 Jun 2026 11:57:29 +0000 (08:57 -0300)
arch/arm/dts/imx8mm-icore-mx8mm[ctouch2.dts,edimm2.2.dts] are same as
the one in dts/upstream, so drop the copy and switch to OF_UPSTREAM by
updating config and selecting OF_UPSTREAM.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
arch/arm/dts/Makefile
arch/arm/dts/imx8mm-icore-mx8mm-ctouch2.dts [deleted file]
arch/arm/dts/imx8mm-icore-mx8mm-edimm2.2.dts [deleted file]
arch/arm/dts/imx8mm-icore-mx8mm.dtsi [deleted file]
arch/arm/mach-imx/imx8m/Kconfig
configs/imx8mm-icore-mx8mm-ctouch2_defconfig
configs/imx8mm-icore-mx8mm-edimm2.2_defconfig

index 9899ab1df2b19673f7d09f0aed9ee4bae55c5580..119f822dd665163dded99d2c58f939d0ce073e62 100644 (file)
@@ -867,8 +867,6 @@ dtb-$(CONFIG_ARCH_IMX8) += \
 
 dtb-$(CONFIG_ARCH_IMX8M) += \
        imx8mm-data-modul-edm-sbc.dtb \
-       imx8mm-icore-mx8mm-ctouch2.dtb \
-       imx8mm-icore-mx8mm-edimm2.2.dtb \
        imx8mm-mx8menlo.dtb \
        imx8mm-phg.dtb \
        imx8mq-cm.dtb \
diff --git a/arch/arm/dts/imx8mm-icore-mx8mm-ctouch2.dts b/arch/arm/dts/imx8mm-icore-mx8mm-ctouch2.dts
deleted file mode 100644 (file)
index 5027454..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2019 NXP
- * Copyright (c) 2019 Engicam srl
- * Copyright (c) 2020 Amarula Solutions(India)
- */
-
-/dts-v1/;
-#include "imx8mm.dtsi"
-#include "imx8mm-icore-mx8mm.dtsi"
-
-/ {
-       model = "Engicam i.Core MX8M Mini C.TOUCH 2.0";
-       compatible = "engicam,icore-mx8mm-ctouch2", "engicam,icore-mx8mm",
-                    "fsl,imx8mm";
-
-       chosen {
-               stdout-path = &uart2;
-       };
-};
-
-&fec1 {
-       status = "okay";
-};
-
-&i2c2 {
-       clock-frequency = <400000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c2>;
-       status = "okay";
-};
-
-&i2c4 {
-       clock-frequency = <100000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c4>;
-       status = "okay";
-};
-
-&iomuxc {
-       pinctrl_i2c2: i2c2grp {
-               fsl,pins = <
-                       MX8MM_IOMUXC_I2C2_SCL_I2C2_SCL          0x400001c3
-                       MX8MM_IOMUXC_I2C2_SDA_I2C2_SDA          0x400001c3
-               >;
-       };
-
-       pinctrl_i2c4: i2c4grp {
-               fsl,pins = <
-                       MX8MM_IOMUXC_I2C4_SCL_I2C4_SCL          0x400001c3
-                       MX8MM_IOMUXC_I2C4_SDA_I2C4_SDA          0x400001c3
-               >;
-       };
-
-       pinctrl_uart2: uart2grp {
-               fsl,pins = <
-                       MX8MM_IOMUXC_UART2_RXD_UART2_DCE_RX     0x140
-                       MX8MM_IOMUXC_UART2_TXD_UART2_DCE_TX     0x140
-               >;
-       };
-
-       pinctrl_usdhc1_gpio: usdhc1gpiogrp {
-               fsl,pins = <
-                       MX8MM_IOMUXC_GPIO1_IO06_GPIO1_IO6       0x41
-               >;
-       };
-
-       pinctrl_usdhc1: usdhc1grp {
-               fsl,pins = <
-                       MX8MM_IOMUXC_SD1_CLK_USDHC1_CLK         0x190
-                       MX8MM_IOMUXC_SD1_CMD_USDHC1_CMD         0x1d0
-                       MX8MM_IOMUXC_SD1_DATA0_USDHC1_DATA0     0x1d0
-                       MX8MM_IOMUXC_SD1_DATA1_USDHC1_DATA1     0x1d0
-                       MX8MM_IOMUXC_SD1_DATA2_USDHC1_DATA2     0x1d0
-                       MX8MM_IOMUXC_SD1_DATA3_USDHC1_DATA3     0x1d0
-               >;
-       };
-};
-
-&uart2 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart2>;
-       status = "okay";
-};
-
-/* SD */
-&usdhc1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_usdhc1>, <&pinctrl_usdhc1_gpio>;
-       cd-gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
-       max-frequency = <50000000>;
-       bus-width = <4>;
-       no-1-8-v;
-       keep-power-in-suspend;
-       status = "okay";
-};
diff --git a/arch/arm/dts/imx8mm-icore-mx8mm-edimm2.2.dts b/arch/arm/dts/imx8mm-icore-mx8mm-edimm2.2.dts
deleted file mode 100644 (file)
index ddac8bc..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2019 NXP
- * Copyright (c) 2019 Engicam srl
- * Copyright (c) 2020 Amarula Solutions(India)
- */
-
-/dts-v1/;
-#include "imx8mm.dtsi"
-#include "imx8mm-icore-mx8mm.dtsi"
-
-/ {
-       model = "Engicam i.Core MX8M Mini EDIMM2.2 Starter Kit";
-       compatible = "engicam,icore-mx8mm-edimm2.2", "engicam,icore-mx8mm",
-                    "fsl,imx8mm";
-
-       chosen {
-               stdout-path = &uart2;
-       };
-};
-
-&fec1 {
-       status = "okay";
-};
-
-&i2c2 {
-       clock-frequency = <400000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c2>;
-       status = "okay";
-};
-
-&i2c4 {
-       clock-frequency = <100000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c4>;
-       status = "okay";
-};
-
-&iomuxc {
-       pinctrl_i2c2: i2c2grp {
-               fsl,pins = <
-                       MX8MM_IOMUXC_I2C2_SCL_I2C2_SCL          0x400001c3
-                       MX8MM_IOMUXC_I2C2_SDA_I2C2_SDA          0x400001c3
-               >;
-       };
-
-       pinctrl_i2c4: i2c4grp {
-               fsl,pins = <
-                       MX8MM_IOMUXC_I2C4_SCL_I2C4_SCL          0x400001c3
-                       MX8MM_IOMUXC_I2C4_SDA_I2C4_SDA          0x400001c3
-               >;
-       };
-
-       pinctrl_uart2: uart2grp {
-               fsl,pins = <
-                       MX8MM_IOMUXC_UART2_RXD_UART2_DCE_RX     0x140
-                       MX8MM_IOMUXC_UART2_TXD_UART2_DCE_TX     0x140
-               >;
-       };
-
-       pinctrl_usdhc1_gpio: usdhc1gpiogrp {
-               fsl,pins = <
-                       MX8MM_IOMUXC_GPIO1_IO06_GPIO1_IO6       0x41
-               >;
-       };
-
-       pinctrl_usdhc1: usdhc1grp {
-               fsl,pins = <
-                       MX8MM_IOMUXC_SD1_CLK_USDHC1_CLK         0x190
-                       MX8MM_IOMUXC_SD1_CMD_USDHC1_CMD         0x1d0
-                       MX8MM_IOMUXC_SD1_DATA0_USDHC1_DATA0     0x1d0
-                       MX8MM_IOMUXC_SD1_DATA1_USDHC1_DATA1     0x1d0
-                       MX8MM_IOMUXC_SD1_DATA2_USDHC1_DATA2     0x1d0
-                       MX8MM_IOMUXC_SD1_DATA3_USDHC1_DATA3     0x1d0
-               >;
-       };
-};
-
-&uart2 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart2>;
-       status = "okay";
-};
-
-/* SD */
-&usdhc1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_usdhc1>, <&pinctrl_usdhc1_gpio>;
-       cd-gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
-       max-frequency = <50000000>;
-       bus-width = <4>;
-       no-1-8-v;
-       keep-power-in-suspend;
-       status = "okay";
-};
diff --git a/arch/arm/dts/imx8mm-icore-mx8mm.dtsi b/arch/arm/dts/imx8mm-icore-mx8mm.dtsi
deleted file mode 100644 (file)
index def7bb5..0000000
+++ /dev/null
@@ -1,232 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2018 NXP
- * Copyright (c) 2019 Engicam srl
- * Copyright (c) 2020 Amarula Solutions(India)
- */
-
-/ {
-       compatible = "engicam,icore-mx8mm", "fsl,imx8mm";
-};
-
-&A53_0 {
-       cpu-supply = <&reg_buck4>;
-};
-
-&A53_1 {
-       cpu-supply = <&reg_buck4>;
-};
-
-&A53_2 {
-       cpu-supply = <&reg_buck4>;
-};
-
-&A53_3 {
-       cpu-supply = <&reg_buck4>;
-};
-
-&fec1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_fec1>;
-       phy-mode = "rgmii-id";
-       phy-handle = <&ethphy>;
-
-       mdio {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               ethphy: ethernet-phy@3 {
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       reg = <3>;
-                       reset-gpios = <&gpio3 7 GPIO_ACTIVE_LOW>;
-                       reset-assert-us = <10000>;
-               };
-       };
-};
-
-&i2c1 {
-       clock-frequency = <400000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c1>;
-       status = "okay";
-
-       pmic@8 {
-               compatible = "nxp,pf8121a";
-               reg = <0x08>;
-
-               regulators {
-                       reg_ldo1: ldo1 {
-                               regulator-min-microvolt = <1500000>;
-                               regulator-max-microvolt = <5000000>;
-                               regulator-always-on;
-                               regulator-boot-on;
-                       };
-
-                       reg_ldo2: ldo2 {
-                               regulator-min-microvolt = <1500000>;
-                               regulator-max-microvolt = <5000000>;
-                               regulator-always-on;
-                               regulator-boot-on;
-                       };
-
-                       reg_ldo3: ldo3 {
-                               regulator-min-microvolt = <1500000>;
-                               regulator-max-microvolt = <5000000>;
-                               regulator-always-on;
-                               regulator-boot-on;
-                       };
-
-                       reg_ldo4: ldo4 {
-                               regulator-min-microvolt = <1500000>;
-                               regulator-max-microvolt = <5000000>;
-                               regulator-always-on;
-                               regulator-boot-on;
-                       };
-
-                       reg_buck1: buck1 {
-                               regulator-min-microvolt = <400000>;
-                               regulator-max-microvolt = <1800000>;
-                               regulator-always-on;
-                               regulator-boot-on;
-                       };
-
-                       reg_buck2: buck2 {
-                               regulator-min-microvolt = <400000>;
-                               regulator-max-microvolt = <1800000>;
-                               regulator-always-on;
-                               regulator-boot-on;
-                       };
-
-                       reg_buck3: buck3 {
-                               regulator-min-microvolt = <400000>;
-                               regulator-max-microvolt = <1800000>;
-                               regulator-always-on;
-                               regulator-boot-on;
-                       };
-
-                       reg_buck4: buck4 {
-                               regulator-min-microvolt = <400000>;
-                               regulator-max-microvolt = <1800000>;
-                               regulator-always-on;
-                               regulator-boot-on;
-                       };
-
-                       reg_buck5: buck5 {
-                               regulator-min-microvolt = <400000>;
-                               regulator-max-microvolt = <1800000>;
-                               regulator-always-on;
-                               regulator-boot-on;
-                       };
-
-                       reg_buck6: buck6 {
-                               regulator-min-microvolt = <400000>;
-                               regulator-max-microvolt = <1800000>;
-                               regulator-always-on;
-                               regulator-boot-on;
-                       };
-
-                       reg_buck7: buck7 {
-                               regulator-min-microvolt = <3300000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-always-on;
-                               regulator-boot-on;
-                       };
-
-                       reg_vsnvs: vsnvs {
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-always-on;
-                               regulator-boot-on;
-                       };
-               };
-       };
-};
-
-&iomuxc {
-       pinctrl_fec1: fec1grp {
-               fsl,pins = <
-                       MX8MM_IOMUXC_ENET_MDC_ENET1_MDC                 0x3
-                       MX8MM_IOMUXC_ENET_MDIO_ENET1_MDIO               0x3
-                       MX8MM_IOMUXC_ENET_TD3_ENET1_RGMII_TD3           0x1f
-                       MX8MM_IOMUXC_ENET_TD2_ENET1_RGMII_TD2           0x1f
-                       MX8MM_IOMUXC_ENET_TD1_ENET1_RGMII_TD1           0x1f
-                       MX8MM_IOMUXC_ENET_TD0_ENET1_RGMII_TD0           0x1f
-                       MX8MM_IOMUXC_ENET_RD3_ENET1_RGMII_RD3           0x91
-                       MX8MM_IOMUXC_ENET_RD2_ENET1_RGMII_RD2           0x91
-                       MX8MM_IOMUXC_ENET_RD1_ENET1_RGMII_RD1           0x91
-                       MX8MM_IOMUXC_ENET_RD0_ENET1_RGMII_RD0           0x91
-                       MX8MM_IOMUXC_ENET_TXC_ENET1_RGMII_TXC           0x1f
-                       MX8MM_IOMUXC_ENET_RXC_ENET1_RGMII_RXC           0x91
-                       MX8MM_IOMUXC_ENET_RX_CTL_ENET1_RGMII_RX_CTL     0x91
-                       MX8MM_IOMUXC_ENET_TX_CTL_ENET1_RGMII_TX_CTL     0x1f
-                       MX8MM_IOMUXC_NAND_DATA01_GPIO3_IO7              0x19
-               >;
-       };
-
-       pinctrl_i2c1: i2c1grp {
-               fsl,pins = <
-                       MX8MM_IOMUXC_I2C1_SCL_I2C1_SCL          0x400001c3
-                       MX8MM_IOMUXC_I2C1_SDA_I2C1_SDA          0x400001c3
-               >;
-       };
-
-       pinctrl_usdhc3: usdhc3grp {
-               fsl,pins = <
-                       MX8MM_IOMUXC_NAND_WE_B_USDHC3_CLK               0x190
-                       MX8MM_IOMUXC_NAND_WP_B_USDHC3_CMD               0x1d0
-                       MX8MM_IOMUXC_NAND_DATA04_USDHC3_DATA0           0x1d0
-                       MX8MM_IOMUXC_NAND_DATA05_USDHC3_DATA1           0x1d0
-                       MX8MM_IOMUXC_NAND_DATA06_USDHC3_DATA2           0x1d0
-                       MX8MM_IOMUXC_NAND_DATA06_USDHC3_DATA2           0x1d0
-                       MX8MM_IOMUXC_NAND_DATA07_USDHC3_DATA3           0x1d0
-                       MX8MM_IOMUXC_NAND_RE_B_USDHC3_DATA4             0x1d0
-                       MX8MM_IOMUXC_NAND_CE2_B_USDHC3_DATA5            0x1d0
-                       MX8MM_IOMUXC_NAND_CE3_B_USDHC3_DATA6            0x1d0
-                       MX8MM_IOMUXC_NAND_CLE_USDHC3_DATA7              0x1d0
-                       MX8MM_IOMUXC_NAND_CE1_B_USDHC3_STROBE           0x190
-               >;
-       };
-
-       pinctrl_usdhc3_100mhz: usdhc3-100mhzgrp {
-               fsl,pins = <
-                       MX8MM_IOMUXC_NAND_WE_B_USDHC3_CLK               0x194
-                       MX8MM_IOMUXC_NAND_WP_B_USDHC3_CMD               0x1d4
-                       MX8MM_IOMUXC_NAND_DATA04_USDHC3_DATA0           0x1d4
-                       MX8MM_IOMUXC_NAND_DATA05_USDHC3_DATA1           0x1d4
-                       MX8MM_IOMUXC_NAND_DATA06_USDHC3_DATA2           0x1d4
-                       MX8MM_IOMUXC_NAND_DATA07_USDHC3_DATA3           0x1d4
-                       MX8MM_IOMUXC_NAND_RE_B_USDHC3_DATA4             0x1d4
-                       MX8MM_IOMUXC_NAND_CE2_B_USDHC3_DATA5            0x1d4
-                       MX8MM_IOMUXC_NAND_CE3_B_USDHC3_DATA6            0x1d4
-                       MX8MM_IOMUXC_NAND_CLE_USDHC3_DATA7              0x1d4
-                       MX8MM_IOMUXC_NAND_CE1_B_USDHC3_STROBE           0x194
-               >;
-       };
-
-       pinctrl_usdhc3_200mhz: usdhc3-200mhzgrp {
-               fsl,pins = <
-                       MX8MM_IOMUXC_NAND_WE_B_USDHC3_CLK               0x196
-                       MX8MM_IOMUXC_NAND_WP_B_USDHC3_CMD               0x1d6
-                       MX8MM_IOMUXC_NAND_DATA04_USDHC3_DATA0           0x1d6
-                       MX8MM_IOMUXC_NAND_DATA05_USDHC3_DATA1           0x1d6
-                       MX8MM_IOMUXC_NAND_DATA06_USDHC3_DATA2           0x1d6
-                       MX8MM_IOMUXC_NAND_DATA07_USDHC3_DATA3           0x1d6
-                       MX8MM_IOMUXC_NAND_RE_B_USDHC3_DATA4             0x1d6
-                       MX8MM_IOMUXC_NAND_CE2_B_USDHC3_DATA5            0x1d6
-                       MX8MM_IOMUXC_NAND_CE3_B_USDHC3_DATA6            0x1d6
-                       MX8MM_IOMUXC_NAND_CLE_USDHC3_DATA7              0x1d6
-                       MX8MM_IOMUXC_NAND_CE1_B_USDHC3_STROBE           0x196
-               >;
-       };
-};
-
-/* eMMC */
-&usdhc3 {
-       pinctrl-names = "default", "state_100mhz", "state_200mhz";
-       pinctrl-0 = <&pinctrl_usdhc3>;
-       pinctrl-1 = <&pinctrl_usdhc3_100mhz>;
-       pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
-       bus-width = <8>;
-       non-removable;
-       status = "okay";
-};
index 0e885f97e63b46832231d15e047f5dd5a1832f3f..936d550588f968622a195602afe0ca69c0937d07 100644 (file)
@@ -114,6 +114,7 @@ config TARGET_IMX8MM_ICORE_MX8MM
        select IMX8MM
        select SUPPORT_SPL
        select IMX8M_LPDDR4
+       imply OF_UPSTREAM
        help
          i.Core MX8M Mini is an EDIMM SOM based on NXP i.MX8MM.
 
index eca9bf633760c2459a327e40509dbffce2bc729b..2db503652ee41290f4c9cec55f155946d480ee22 100644 (file)
@@ -7,7 +7,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x400000
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="imx8mm-icore-mx8mm-ctouch2"
+CONFIG_DEFAULT_DEVICE_TREE="freescale/imx8mm-icore-mx8mm-ctouch2"
 CONFIG_TARGET_IMX8MM_ICORE_MX8MM=y
 CONFIG_SYS_MONITOR_LEN=524288
 CONFIG_SPL_MMC=y
index 29114486cba31e3e7444466ce6f1ea52121fb536..7650d7b734d1f42f442d6fe914e56a0ed318ac47 100644 (file)
@@ -7,7 +7,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x400000
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="imx8mm-icore-mx8mm-edimm2.2"
+CONFIG_DEFAULT_DEVICE_TREE="freescale/imx8mm-icore-mx8mm-edimm2.2"
 CONFIG_TARGET_IMX8MM_ICORE_MX8MM=y
 CONFIG_SYS_MONITOR_LEN=524288
 CONFIG_SPL_MMC=y