imx: mx6ul: Add i.MX6UL CPU type

Add MXC_CPU_MX6UL for i.MX6UL CPU type which is got at runtime from
DIGPROG register. But the value has been occupied by MXC_CPU_MX6D which
is not real id from DIGPROG register, so change i.MX6D to value 0x67 which
was not occupied.

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Signed-off-by: Ye.Li <B37916@freescale.com>

diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c
index 15340f8c5dcac2fba166acbe5ace336ff4596aa6..496d1b207e8531bfff759dabef29c75e68e3cbf5 100644 (file)
--- a/arch/arm/imx-common/cpu.c
+++ b/arch/arm/imx-common/cpu.c
@@ -138,6 +138,8 @@ const char *get_imx_type(u32 imxtype)
                return "6SL";   /* Solo-Lite version of the mx6 */
        case MXC_CPU_MX6SX:
                return "6SX";   /* SoloX version of the mx6 */
                return "6SL";   /* Solo-Lite version of the mx6 */
        case MXC_CPU_MX6SX:
                return "6SX";   /* SoloX version of the mx6 */

+       case MXC_CPU_MX6UL:
+               return "6UL";   /* Ultra-Lite version of the mx6 */

        case MXC_CPU_MX51:
                return "51";
        case MXC_CPU_MX53:
        case MXC_CPU_MX51:
                return "51";
        case MXC_CPU_MX53:

diff --git a/arch/arm/include/asm/arch-imx/cpu.h b/arch/arm/include/asm/arch-imx/cpu.h
index 99e0e32e386d45d298cd6759a8ff36b4d745577c..c7f9fffacb9408c1cc1c207a3d16c448c17d93be 100644 (file)
--- a/arch/arm/include/asm/arch-imx/cpu.h
+++ b/arch/arm/include/asm/arch-imx/cpu.h
@@ -10,8 +10,9 @@
 #define MXC_CPU_MX6DL          0x61
 #define MXC_CPU_MX6SX          0x62
 #define MXC_CPU_MX6Q           0x63
 #define MXC_CPU_MX6DL          0x61
 #define MXC_CPU_MX6SX          0x62
 #define MXC_CPU_MX6Q           0x63

-#define MXC_CPU_MX6D           0x64
+#define MXC_CPU_MX6UL          0x64

 #define MXC_CPU_MX6SOLO                0x65 /* dummy ID */
 #define MXC_CPU_MX6SOLO                0x65 /* dummy ID */

+#define MXC_CPU_MX6D           0x67

 #define MXC_CPU_MX6DP          0x68
 #define MXC_CPU_MX6QP          0x69
 
 #define MXC_CPU_MX6DP          0x68
 #define MXC_CPU_MX6QP          0x69