imx8mp: Remove parts MIMX8ML7 and MIMX8ML5 support

Latest datasheet revE has removed MIMX8ML7D/5D/7C/5C parts, so
update u-boot to remove decoding and support for those parts.

Signed-off-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>

diff --git a/arch/arm/include/asm/arch-imx/cpu.h b/arch/arm/include/asm/arch-imx/cpu.h
index 75ff991248c7a559f209b918d5e6be456b42da21..f37fe214460fec2da3631edcaedf8795e1407176 100644 (file)
--- a/arch/arm/include/asm/arch-imx/cpu.h
+++ b/arch/arm/include/asm/arch-imx/cpu.h
@@ -41,9 +41,7 @@
 #define MXC_CPU_IMX8MNDL               0x8f /* dummy ID */
 #define MXC_CPU_IMX8MNSL               0x181 /* dummy ID */
 #define MXC_CPU_IMX8MP         0x182/* dummy ID */
-#define MXC_CPU_IMX8MP7                0x183 /* dummy ID */
 #define MXC_CPU_IMX8MP6                0x184 /* dummy ID */
-#define MXC_CPU_IMX8MP5                0x185 /* dummy ID */
 #define MXC_CPU_IMX8MPL                0x186 /* dummy ID */
 #define MXC_CPU_IMX8MPD                0x187 /* dummy ID */
 #define MXC_CPU_IMX8QXP_A0     0x90 /* dummy ID */

diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h
index 15d1cba8e74ab7895ef04edeada5d8582463398b..5f0c1ae2182b0b664cf0452f25e760aa68cbe76d 100644 (file)
--- a/arch/arm/include/asm/mach-imx/sys_proto.h
+++ b/arch/arm/include/asm/mach-imx/sys_proto.h
@@ -67,13 +67,10 @@ struct bd_info;
 #define is_imx8mndl() (is_cpu_type(MXC_CPU_IMX8MNDL))
 #define is_imx8mnsl() (is_cpu_type(MXC_CPU_IMX8MNSL))
 #define is_imx8mp() (is_cpu_type(MXC_CPU_IMX8MP)  || is_cpu_type(MXC_CPU_IMX8MPD) || \
-       is_cpu_type(MXC_CPU_IMX8MPL) || is_cpu_type(MXC_CPU_IMX8MP7) || \
-       is_cpu_type(MXC_CPU_IMX8MP6) || is_cpu_type(MXC_CPU_IMX8MP5))
+       is_cpu_type(MXC_CPU_IMX8MPL) || is_cpu_type(MXC_CPU_IMX8MP6))
 #define is_imx8mpd() (is_cpu_type(MXC_CPU_IMX8MPD))
 #define is_imx8mpl() (is_cpu_type(MXC_CPU_IMX8MPL))
-#define is_imx8mp7() (is_cpu_type(MXC_CPU_IMX8MP7))
 #define is_imx8mp6() (is_cpu_type(MXC_CPU_IMX8MP6))
-#define is_imx8mp5() (is_cpu_type(MXC_CPU_IMX8MP5))
 
 #define is_imx8qxp() (is_cpu_type(MXC_CPU_IMX8QXP))
 

diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c
index fe8d5947cceac3ffe7f7604e76661a7a570ee1f2..4a175cb86f45fca9458c53fae8a2f990c67d0bec 100644 (file)
--- a/arch/arm/mach-imx/cpu.c
+++ b/arch/arm/mach-imx/cpu.c
@@ -102,12 +102,8 @@ const char *get_imx_type(u32 imxtype)
                return "8MP Dual[3]";   /* Dual-core version of the imx8mp */
        case MXC_CPU_IMX8MPL:
                return "8MP Lite[4]";   /* Quad-core Lite version of the imx8mp */
-       case MXC_CPU_IMX8MP7:
-               return "8MP[7]";        /* Quad-core version of the imx8mp, VPU fused */
        case MXC_CPU_IMX8MP6:
                return "8MP[6]";        /* Quad-core version of the imx8mp, NPU fused */
-       case MXC_CPU_IMX8MP5:
-               return "8MP[5]";        /* Quad-core version of the imx8mp, ISP fused */
        case MXC_CPU_IMX8MN:
                return "8MNano Quad"; /* Quad-core version */
        case MXC_CPU_IMX8MND:

diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 8dfc8645fc0a66a467cd9655a49627b9d05f12b9..9bca5bf972714b19f99eb332a86a0a0940b956da 100644 (file)
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -343,12 +343,8 @@ static u32 get_cpu_variant_type(u32 type)
                switch (flag) {
                case 7:
                        return MXC_CPU_IMX8MPL;
-               case 6:
-                       return MXC_CPU_IMX8MP5;
                case 2:
                        return MXC_CPU_IMX8MP6;
-               case 1:
-                       return MXC_CPU_IMX8MP7;
                default:
                        break;
                }
@@ -889,16 +885,16 @@ usb_modify_speed:
                disable_cpu_nodes(blob, 3);
 
 #elif defined(CONFIG_IMX8MP)
-       if (is_imx8mpl() || is_imx8mp7())
+       if (is_imx8mpl())
                disable_vpu_nodes(blob);
 
-       if (is_imx8mpl() || is_imx8mp6() || is_imx8mp5())
+       if (is_imx8mpl() || is_imx8mp6())
                disable_npu_nodes(blob);
 
-       if (is_imx8mpl() || is_imx8mp5())
+       if (is_imx8mpl())
                disable_isp_nodes(blob);
 
-       if (is_imx8mpl() || is_imx8mp7() || is_imx8mp6() || is_imx8mp5())
+       if (is_imx8mpl() || is_imx8mp6())
                disable_dsp_nodes(blob);
 
        if (is_imx8mpd())