imx: add i.MX6ULZ cpu type

Add i.MX6ULZ cpu type and helper.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>

diff --git a/arch/arm/include/asm/arch-imx/cpu.h b/arch/arm/include/asm/arch-imx/cpu.h
index d4a83eef72d1fd0f6ccc9224707dbe0253fb0171..073efcd1b42762abb2be8ba492733f22c9c40606 100644 (file)
--- a/arch/arm/include/asm/arch-imx/cpu.h
+++ b/arch/arm/include/asm/arch-imx/cpu.h
@@ -17,6 +17,7 @@
 #define MXC_CPU_MX6Q           0x63
 #define MXC_CPU_MX6UL          0x64
 #define MXC_CPU_MX6ULL         0x65
+#define MXC_CPU_MX6ULZ         0x6B
 #define MXC_CPU_MX6SOLO                0x66 /* dummy */
 #define MXC_CPU_MX6SLL         0x67
 #define MXC_CPU_MX6D           0x6A

diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h
index 4925dd7894510c39343bf82d207beb0db5215b23..260608062e117a917ff9ae4f6ce80f4bf767d975 100644 (file)
--- a/arch/arm/include/asm/mach-imx/sys_proto.h
+++ b/arch/arm/include/asm/mach-imx/sys_proto.h
@@ -38,6 +38,7 @@
 #define is_mx6solo() (is_cpu_type(MXC_CPU_MX6SOLO))
 #define is_mx6ul() (is_cpu_type(MXC_CPU_MX6UL))
 #define is_mx6ull() (is_cpu_type(MXC_CPU_MX6ULL))
+#define is_mx6ulz() (is_cpu_type(MXC_CPU_MX6ULZ))
 #define is_mx6sll() (is_cpu_type(MXC_CPU_MX6SLL))
 
 #define is_mx7ulp() (is_cpu_type(MXC_CPU_MX7ULP))

diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c
index 6e9a17521097744abe3666c62a716cb0d4178e2c..73ce7f8d7d54d3cf1ac02da8f19d1cfa702a05d4 100644 (file)
--- a/arch/arm/mach-imx/cpu.c
+++ b/arch/arm/mach-imx/cpu.c
@@ -173,6 +173,8 @@ const char *get_imx_type(u32 imxtype)
                return "6UL";   /* Ultra-Lite version of the mx6 */
        case MXC_CPU_MX6ULL:
                return "6ULL";  /* ULL version of the mx6 */
+       case MXC_CPU_MX6ULZ:
+               return "6ULZ";  /* ULZ version of the mx6 */
        case MXC_CPU_MX51:
                return "51";
        case MXC_CPU_MX53:

diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c
index 075d2467ce421761ce16be3e3a42dbc836ab29d9..d37d3856d3e2fa387944dc96d33637f9ae562b0a 100644 (file)
--- a/arch/arm/mach-imx/mx6/soc.c
+++ b/arch/arm/mach-imx/mx6/soc.c
@@ -85,6 +85,10 @@ u32 get_cpu_rev(void)
                                type = MXC_CPU_MX6D;
                }
 
+               if (type == MXC_CPU_MX6ULL) {
+                       if (readl(SRC_BASE_ADDR + 0x1c) & (1 << 6))
+                               type = MXC_CPU_MX6ULZ;
+               }
        }
        major = ((reg >> 8) & 0xff);
        if ((major >= 1) &&