Merge git://git.denx.de/u-boot

[oweals/u-boot.git] / arch / arm / include / asm / arch-imx / cpu.h

diff --git a/arch/arm/include/asm/arch-imx/cpu.h b/arch/arm/include/asm/arch-imx/cpu.h
index 254136e2288323ed436d8ac1a1fa3a09fe7acc9c..8a75902ee5d6f43407c0d1c6c98cd8a54ae86131 100644 (file)
--- a/arch/arm/include/asm/arch-imx/cpu.h
+++ b/arch/arm/include/asm/arch-imx/cpu.h
@@ -4,16 +4,44 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
+#define MXC_CPU_MX23           0x23
+#define MXC_CPU_MX25           0x25
+#define MXC_CPU_MX27           0x27
+#define MXC_CPU_MX28           0x28
+#define MXC_CPU_MX31           0x31
+#define MXC_CPU_MX35           0x35
 #define MXC_CPU_MX51           0x51
 #define MXC_CPU_MX53           0x53
 #define MXC_CPU_MX6SL          0x60
 #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_MX6D           0x67
+#define MXC_CPU_MX6DP          0x68
+#define MXC_CPU_MX6QP          0x69
+#define MXC_CPU_MX7D           0x72
+#define MXC_CPU_VF610          0xF6 /* dummy ID */
+
+#define MXC_SOC_MX6            0x60
+#define MXC_SOC_MX7            0x70
+
+#define CHIP_REV_1_0            0x10
+#define CHIP_REV_1_1            0x11
+#define CHIP_REV_1_2            0x12
+#define CHIP_REV_1_5            0x15
+#define CHIP_REV_2_0            0x20
+#define CHIP_REV_2_5            0x25
+#define CHIP_REV_3_0            0x30
+
+#define BOARD_REV_1_0           0x0
+#define BOARD_REV_2_0           0x1
+#define BOARD_VER_OFFSET        0x8
 
 #define CS0_128                                        0
 #define CS0_64M_CS1_64M                                1
 #define CS0_64M_CS1_32M_CS2_32M                        2
 #define CS0_32M_CS1_32M_CS2_32M_CS3_32M                3
+
+u32 get_imx_reset_cause(void);