imx: Introduce a header for the imx cpu versions

Instead of duplicating the CPU definitions at mx5 and mx6 sys_proto.h header
files, introduce a common header to centralize such definitions.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

diff --git a/arch/arm/include/asm/arch-imx/cpu.h b/arch/arm/include/asm/arch-imx/cpu.h
new file mode 100644 (file)
index 0000000..8c725e2
--- /dev/null
+++ b/arch/arm/include/asm/arch-imx/cpu.h
@@ -0,0 +1,12 @@
+/*
+ * (C) Copyright 2014 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#define MXC_CPU_MX51           0x51
+#define MXC_CPU_MX53           0x53
+#define MXC_CPU_MX6SL          0x60
+#define MXC_CPU_MX6DL          0x61
+#define MXC_CPU_MX6SOLO                0x62
+#define MXC_CPU_MX6Q           0x63

diff --git a/arch/arm/include/asm/arch-mx5/sys_proto.h b/arch/arm/include/asm/arch-mx5/sys_proto.h
index 9949ad13122fb687c9f53d0ae6115e57637aa8a9..ac7705b3b099dd28ad7639670ad3d78df668987d 100644 (file)
--- a/arch/arm/include/asm/arch-mx5/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx5/sys_proto.h
@@ -8,12 +8,7 @@
 #ifndef _SYS_PROTO_H_
 #define _SYS_PROTO_H_
 
 #ifndef _SYS_PROTO_H_
 #define _SYS_PROTO_H_
 

-#define MXC_CPU_MX51           0x51
-#define MXC_CPU_MX53           0x53
-#define MXC_CPU_MX6SL          0x60
-#define MXC_CPU_MX6DL          0x61
-#define MXC_CPU_MX6SOLO                0x62
-#define MXC_CPU_MX6Q           0x63
+#include "../arch-imx/cpu.h"

 
 #define is_soc_rev(rev)        ((get_cpu_rev() & 0xFF) - rev)
 u32 get_cpu_rev(void);
 
 #define is_soc_rev(rev)        ((get_cpu_rev() & 0xFF) - rev)
 u32 get_cpu_rev(void);

diff --git a/arch/arm/include/asm/arch-mx6/sys_proto.h b/arch/arm/include/asm/arch-mx6/sys_proto.h
index 17125a6f3e326c4d2718c98a14ed311cf6a6f8e5..38851a135c8a5bf4686226ed715cf3d3ad791e4d 100644 (file)
--- a/arch/arm/include/asm/arch-mx6/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx6/sys_proto.h
@@ -9,13 +9,7 @@
 #define _SYS_PROTO_H_
 
 #include <asm/imx-common/regs-common.h>
 #define _SYS_PROTO_H_
 
 #include <asm/imx-common/regs-common.h>

-
-#define MXC_CPU_MX51           0x51
-#define MXC_CPU_MX53           0x53
-#define MXC_CPU_MX6SL          0x60
-#define MXC_CPU_MX6DL          0x61
-#define MXC_CPU_MX6SOLO                0x62
-#define MXC_CPU_MX6Q           0x63
+#include "../arch-imx/cpu.h"

 
 #define is_soc_rev(rev)        ((get_cpu_rev() & 0xFF) - rev)
 u32 get_cpu_rev(void);
 
 #define is_soc_rev(rev)        ((get_cpu_rev() & 0xFF) - rev)
 u32 get_cpu_rev(void);