imx91: Drop OF_UPSTREAM

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>

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 be923e5076a47c2c0482ae3a16520e16d4754f80..9963f0bb5ce7d671f8be4dd6bde587f82d67b6d4 100644 (file)
--- 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 e6cafdcd81330031e9fc2df23fa2428c285aa3b0..280d255c08643aedaa25a097a12e9d346c03a228 100644 (file)
--- 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 810a8a8c012fe7ccf8951e6f8cb945492ec3522d..a57c1fd01f52aba070ff5b1891428212d5aa6bf8 100644 (file)
--- 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 f330ea694f729814b51779f8539050578434a4c4..0533acaaa6b9b4f6b2c76eeec15a99bd32f7c11a 100644 (file)
--- 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