summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurz <akurz@blala.de>2016-09-09 17:43:39 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2016-09-12 08:23:09 +0200
commitcf4414f7a2db42857b88134ea3d103d2688edd8c (patch)
treee0dc9b1b134b899c2f398c708aacf421c3e1cdf5
parentb5952e8304f4c75e073abfcc6af185c94935305e (diff)
downloadbarebox-cf4414f7a2db42857b88134ea3d103d2688edd8c.tar.gz
barebox-cf4414f7a2db42857b88134ea3d103d2688edd8c.tar.xz
ARM: add common definitions for i.MX50 SOC
Signed-off-by: Alexander Kurz <akurz@blala.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--Documentation/boards/imx.rst1
-rw-r--r--arch/arm/mach-imx/include/mach/generic.h13
-rw-r--r--arch/arm/mach-imx/include/mach/imx_cpu_types.h1
3 files changed, 15 insertions, 0 deletions
diff --git a/Documentation/boards/imx.rst b/Documentation/boards/imx.rst
index 6912ed9a54..60cdcf072e 100644
--- a/Documentation/boards/imx.rst
+++ b/Documentation/boards/imx.rst
@@ -16,6 +16,7 @@ The Internal Boot Mode is supported on:
* i.MX25
* i.MX35
+* i.MX50
* i.MX51
* i.MX53
* i.MX6
diff --git a/arch/arm/mach-imx/include/mach/generic.h b/arch/arm/mach-imx/include/mach/generic.h
index 0a4200b3f4..243239d0e8 100644
--- a/arch/arm/mach-imx/include/mach/generic.h
+++ b/arch/arm/mach-imx/include/mach/generic.h
@@ -117,6 +117,19 @@ extern unsigned int __imx_cpu_type;
# define cpu_is_mx35() (0)
#endif
+#ifdef CONFIG_ARCH_IMX50
+# ifdef imx_cpu_type
+# undef imx_cpu_type
+# define imx_cpu_type __imx_cpu_type
+# else
+# define imx_cpu_type IMX_CPU_IMX50
+# endif
+# define cpu_is_mx50() (imx_cpu_type == IMX_CPU_IMX50)
+#else
+# define cpu_is_mx50() (0)
+#endif
+
+
#ifdef CONFIG_ARCH_IMX51
# ifdef imx_cpu_type
# undef imx_cpu_type
diff --git a/arch/arm/mach-imx/include/mach/imx_cpu_types.h b/arch/arm/mach-imx/include/mach/imx_cpu_types.h
index 781ab9fe74..84724883b5 100644
--- a/arch/arm/mach-imx/include/mach/imx_cpu_types.h
+++ b/arch/arm/mach-imx/include/mach/imx_cpu_types.h
@@ -7,6 +7,7 @@
#define IMX_CPU_IMX27 27
#define IMX_CPU_IMX31 31
#define IMX_CPU_IMX35 35
+#define IMX_CPU_IMX50 50
#define IMX_CPU_IMX51 51
#define IMX_CPU_IMX53 53
#define IMX_CPU_IMX6 6