imx9: soc: Disable cpu1 for variants that only has one A55 core

Disale CPU1 for i.MX93 variants that only has one A55 core and update
cooling maps.

Signed-off-by: Peng Fan <peng.fan@nxp.com>

diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index 47e2cb8d943bfc36b28ce4f144f1b93a422ce29b..f8903afc92e1986933e9f047b413eb347c0cd888 100644 (file)
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -12,7 +12,6 @@ endif
 ifeq ($(SOC),$(filter $(SOC),imx8m))
 ifneq ($(CONFIG_SPL_BUILD),y)
 obj-$(CONFIG_IMX_BOOTAUX) += imx_bootaux.o
-obj-y += fdt.o
 endif
 obj-$(CONFIG_ENV_IS_IN_MMC) += mmc_env.o
 obj-$(CONFIG_FEC_MXC) += mac.o
@@ -22,6 +21,12 @@ obj-$(CONFIG_IMX_HAB) += hab.o
 obj-y += cpu.o
 endif
 
+ifeq ($(SOC),$(filter $(SOC),imx8m imx9))
+ifneq ($(CONFIG_SPL_BUILD),y)
+obj-y += fdt.o
+endif
+endif
+
 ifeq ($(SOC),$(filter $(SOC),mx5 mx6))
 obj-y  += cpu.o speed.o
 ifneq ($(CONFIG_MX51),y)

diff --git a/arch/arm/mach-imx/imx9/soc.c b/arch/arm/mach-imx/imx9/soc.c
index 0d909c3e853ec9481ff72d55f10e8fbfc4b1f9b4..e3bfc8d51c52ad6666d4fc0c841e54e952c5691d 100644 (file)
--- a/arch/arm/mach-imx/imx9/soc.c
+++ b/arch/arm/mach-imx/imx9/soc.c
@@ -696,9 +696,17 @@ int board_fix_fdt(void *fdt)
 
 int ft_system_setup(void *blob, struct bd_info *bd)
 {
+       static const char * const nodes_path[] = {
+               "/cpus/cpu@0",
+               "/cpus/cpu@100",
+       };
+
        if (fixup_thermal_trips(blob, "cpu-thermal"))
                printf("Failed to update cpu-thermal trip(s)");
 
+       if (is_imx9351() || is_imx9331() || is_imx9321() || is_imx9311())
+               disable_cpu_nodes(blob, nodes_path, 1, 2);
+
        if (is_voltage_mode(VOLT_LOW_DRIVE))
                low_drive_freq_update(blob);