colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

imx91: Drop OF_UPSTREAM

Browse Source 
i.MX91 device tree still not landed in linux kernel, so drop OF_UPSTREAM
and move the device tree files to arch/arm/dts

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Sumit Garg <sumit.garg@oss.qualcomm.com>
This commit is contained in:
Peng Fan
2025-06-12 10:13:56 +08:00
committed by Tom Rini
parent b62e422d6e
commit 02a2cbfee8
6 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
dts/upstream/src/arm64/freescale/imx91-11x11-evk.dts → arch/arm/dts/imx91-11x11-evk.dts
View File

0
dts/upstream/src/arm64/freescale/imx91-pinfunc.h → arch/arm/dts/imx91-pinfunc.h
View File

17
dts/upstream/src/arm64/freescale/imx91.dtsi → arch/arm/dts/imx91.dtsi
View File

@@ -7,7 +7,6 @@
#include "imx93.dtsi" #include "imx93.dtsi"
/delete-node/ &A55_1; /delete-node/ &A55_1;
/delete-node/ &cm33;
/delete-node/ &mlmix; /delete-node/ &mlmix;
/delete-node/ &mu1; /delete-node/ &mu1;
/delete-node/ &mu2; /delete-node/ &mu2;
@@ -41,18 +40,6 @@
assigned-clock-rates = <100000000>, <250000000>; assigned-clock-rates = <100000000>, <250000000>;
}; };
&i3c1 {
clocks = <&clk IMX93_CLK_BUS_AON>,
<&clk IMX93_CLK_I3C1_GATE>,
<&clk IMX93_CLK_DUMMY>;
};
&i3c2 {
clocks = <&clk IMX93_CLK_BUS_WAKEUP>,
<&clk IMX93_CLK_I3C2_GATE>,
<&clk IMX93_CLK_DUMMY>;
};
&iomuxc { &iomuxc {
compatible = "fsl,imx91-iomuxc"; compatible = "fsl,imx91-iomuxc";
}; };
@@ -61,10 +48,6 @@
status = "disabled"; status = "disabled";
}; };
&{/soc@0/ddr-pmu@4e300dc0} {
compatible = "fsl,imx91-ddr-pmu", "fsl,imx93-ddr-pmu";
};
&{/thermal-zones/cpu-thermal/cooling-maps/map0} { &{/thermal-zones/cpu-thermal/cooling-maps/map0} {
cooling-device = <&A55_0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; cooling-device = <&A55_0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
}; };

1
arch/arm/mach-imx/imx9/Kconfig
View File

@@ -43,7 +43,6 @@ config TARGET_IMX91_11X11_EVK
bool "imx91_11x11_evk" bool "imx91_11x11_evk"
select OF_BOARD_FIXUP select OF_BOARD_FIXUP
select IMX91 select IMX91
imply OF_UPSTREAM
imply BOOTSTD_FULL imply BOOTSTD_FULL
imply BOOTSTD_BOOTCOMMAND imply BOOTSTD_BOOTCOMMAND

2
configs/imx91_11x11_evk_defconfig
View File

@@ -11,7 +11,7 @@ CONFIG_ENV_SIZE=0x4000
CONFIG_ENV_OFFSET=0x700000 CONFIG_ENV_OFFSET=0x700000
CONFIG_IMX_CONFIG="arch/arm/mach-imx/imx9/imximage.cfg" CONFIG_IMX_CONFIG="arch/arm/mach-imx/imx9/imximage.cfg"
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="freescale/imx91-11x11-evk" CONFIG_DEFAULT_DEVICE_TREE="imx91-11x11-evk"
CONFIG_TARGET_IMX91_11X11_EVK=y CONFIG_TARGET_IMX91_11X11_EVK=y
CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SYS_MONITOR_LEN=524288

2
configs/imx91_11x11_evk_inline_ecc_defconfig
View File

@@ -11,7 +11,7 @@ CONFIG_ENV_SIZE=0x4000
CONFIG_ENV_OFFSET=0x700000 CONFIG_ENV_OFFSET=0x700000
CONFIG_IMX_CONFIG="arch/arm/mach-imx/imx9/imximage.cfg" CONFIG_IMX_CONFIG="arch/arm/mach-imx/imx9/imximage.cfg"
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="freescale/imx91-11x11-evk" CONFIG_DEFAULT_DEVICE_TREE="imx91-11x11-evk"
CONFIG_TARGET_IMX91_11X11_EVK=y CONFIG_TARGET_IMX91_11X11_EVK=y
CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SYS_MONITOR_LEN=524288