Hi Peng, It seems in all your previous postings touching dts/upstream, you never CCed me which is the case in this one too. Please run scripts/get_maintainer.pl for your further postings.
On Thu, Jun 12, 2025 at 10:13:56AM +0800, Peng Fan (OSS) wrote: > From: Peng Fan <peng....@nxp.com> > > 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....@nxp.com> > --- > .../arm/dts}/imx91-11x11-evk.dts | 0 > .../freescale => arch/arm/dts}/imx91-pinfunc.h | 0 > .../arm64/freescale => arch/arm/dts}/imx91.dtsi | 17 ----------------- It is really unfortunate that this DT landed in dts/upstream without anything in upstream kernel. Direct patching of dts/upstream is not allowed but you should only be able to do cherry picking as described here [1]. FWIW: Reviewed-by: Sumit Garg <sumit.g...@oss.qualcomm.com> [1] https://docs.u-boot.org/en/latest/develop/devicetree/control.html#resyncing-with-devicetree-rebasing -Sumit > arch/arm/mach-imx/imx9/Kconfig | 1 - > configs/imx91_11x11_evk_defconfig | 2 +- > configs/imx91_11x11_evk_inline_ecc_defconfig | 2 +- > 6 files changed, 2 insertions(+), 20 deletions(-) > rename {dts/upstream/src/arm64/freescale => > arch/arm/dts}/imx91-11x11-evk.dts (100%) > rename {dts/upstream/src/arm64/freescale => arch/arm/dts}/imx91-pinfunc.h > (100%) > rename {dts/upstream/src/arm64/freescale => arch/arm/dts}/imx91.dtsi (79%) > > diff --git a/dts/upstream/src/arm64/freescale/imx91-11x11-evk.dts > b/arch/arm/dts/imx91-11x11-evk.dts > similarity index 100% > rename from dts/upstream/src/arm64/freescale/imx91-11x11-evk.dts > rename to arch/arm/dts/imx91-11x11-evk.dts > diff --git a/dts/upstream/src/arm64/freescale/imx91-pinfunc.h > b/arch/arm/dts/imx91-pinfunc.h > similarity index 100% > rename from dts/upstream/src/arm64/freescale/imx91-pinfunc.h > rename to arch/arm/dts/imx91-pinfunc.h > diff --git a/dts/upstream/src/arm64/freescale/imx91.dtsi > b/arch/arm/dts/imx91.dtsi > similarity index 79% > rename from dts/upstream/src/arm64/freescale/imx91.dtsi > rename to arch/arm/dts/imx91.dtsi > index be923e5076a..9963f0bb5ce 100644 > --- a/dts/upstream/src/arm64/freescale/imx91.dtsi > +++ b/arch/arm/dts/imx91.dtsi > @@ -7,7 +7,6 @@ > #include "imx93.dtsi" > > /delete-node/ &A55_1; > -/delete-node/ &cm33; > /delete-node/ &mlmix; > /delete-node/ &mu1; > /delete-node/ &mu2; > @@ -41,18 +40,6 @@ > 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 { > compatible = "fsl,imx91-iomuxc"; > }; > @@ -61,10 +48,6 @@ > status = "disabled"; > }; > > -&{/soc@0/ddr-pmu@4e300dc0} { > - compatible = "fsl,imx91-ddr-pmu", "fsl,imx93-ddr-pmu"; > -}; > - > &{/thermal-zones/cpu-thermal/cooling-maps/map0} { > cooling-device = <&A55_0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; > }; > diff --git a/arch/arm/mach-imx/imx9/Kconfig b/arch/arm/mach-imx/imx9/Kconfig > index e6cafdcd813..280d255c086 100644 > --- a/arch/arm/mach-imx/imx9/Kconfig > +++ b/arch/arm/mach-imx/imx9/Kconfig > @@ -43,7 +43,6 @@ config TARGET_IMX91_11X11_EVK > bool "imx91_11x11_evk" > select OF_BOARD_FIXUP > select IMX91 > - imply OF_UPSTREAM > imply BOOTSTD_FULL > imply BOOTSTD_BOOTCOMMAND > > diff --git a/configs/imx91_11x11_evk_defconfig > b/configs/imx91_11x11_evk_defconfig > index 810a8a8c012..a57c1fd01f5 100644 > --- a/configs/imx91_11x11_evk_defconfig > +++ b/configs/imx91_11x11_evk_defconfig > @@ -11,7 +11,7 @@ CONFIG_ENV_SIZE=0x4000 > CONFIG_ENV_OFFSET=0x700000 > CONFIG_IMX_CONFIG="arch/arm/mach-imx/imx9/imximage.cfg" > 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_OF_LIBFDT_OVERLAY=y > CONFIG_SYS_MONITOR_LEN=524288 > diff --git a/configs/imx91_11x11_evk_inline_ecc_defconfig > b/configs/imx91_11x11_evk_inline_ecc_defconfig > index f330ea694f7..0533acaaa6b 100644 > --- a/configs/imx91_11x11_evk_inline_ecc_defconfig > +++ b/configs/imx91_11x11_evk_inline_ecc_defconfig > @@ -11,7 +11,7 @@ CONFIG_ENV_SIZE=0x4000 > CONFIG_ENV_OFFSET=0x700000 > CONFIG_IMX_CONFIG="arch/arm/mach-imx/imx9/imximage.cfg" > 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_OF_LIBFDT_OVERLAY=y > CONFIG_SYS_MONITOR_LEN=524288 > -- > 2.35.3 >
