commit dce85095d7792006071fbf26fbd712dbb91701ee
author Alim Akhtar <alim.akhtar@samsung.com> Tue Dec 31 04:40:29 2013
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Jan 08 02:24:27 2014
tree 147eaa33d94c15529bd5f6940876dcafe45aa2ab
parent 033838118815fb72bd62ed3f72d1923638c70b97

ARM: exynos5422: Add a new proid for exynos5422

This adds a new proid for exynos5422 and a combined proid for common
5420 and 5422 cases.

BRANCH=tot
BUG=chrome-os-partner:24688
TEST=compile tested

Change-Id: I1e12fa33d8a0ccc55ac79252b0364f5ef0e4955d
Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/181275
Reviewed-by: Doug Anderson <dianders@chromium.org>
(cherry picked from commit 83b21a874149a97be4e37443c5d2d96d0eff825e)
Reviewed-on: https://chromium-review.googlesource.com/181800
Commit-Queue: Doug Anderson <dianders@chromium.org>
Tested-by: Doug Anderson <dianders@chromium.org>

arch/arm/include/asm/arch-exynos/cpu.h

diff --git a/arch/arm/include/asm/arch-exynos/cpu.h b/arch/arm/include/asm/arch-exynos/cpu.h
index f81e2c0..df49566 100644
--- a/arch/arm/include/asm/arch-exynos/cpu.h
+++ b/arch/arm/include/asm/arch-exynos/cpu.h
@@ -270,6 +270,10 @@
 		/* Exynos5420 */
 		s5p_cpu_id = 0x5420;
 		break;
+	case 0x422:
+		/* Exynos5422 */
+		s5p_cpu_id = 0x5422;
+		break;
 	}
 }
 
@@ -299,6 +303,7 @@
 IS_EXYNOS_TYPE(exynos4412, 0x4412)
 IS_EXYNOS_TYPE(exynos5250, 0x5250)
 IS_EXYNOS_TYPE(exynos5420, 0x5420)
+IS_EXYNOS_TYPE(exynos5422, 0x5422)
 
 #if defined(CONFIG_EXYNOS5)
 #define cpu_is_exynos5() cpu_is_exynos5_()
@@ -318,6 +323,14 @@
 #define proid_is_exynos5420()	(0)
 #endif
 
+#if defined(CONFIG_EXYNOS5422)
+#define proid_is_exynos5422()	proid_is_exynos5422_()
+#else
+#define proid_is_exynos5422()	(0)
+#endif
+
+#define proid_is_exynos542x() (proid_is_exynos5422() || proid_is_exynos5420())
+
 #if defined(CONFIG_EXYNOS5250)
 #define proid_is_exynos5250()	proid_is_exynos5250_()
 #else
@@ -339,7 +352,7 @@
 			return EXYNOS4X12_##base;		\
 		return EXYNOS4_##base;				\
 	} else if (cpu_is_exynos5()) {				\
-		if (proid_is_exynos5420())			\
+		if (proid_is_exynos542x())			\
 			return EXYNOS5420_##base;		\
 		return EXYNOS5_##base;				\
 	}							\