summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChander Kashyap <chander.kashyap@linaro.org>2013-06-18 15:29:34 (GMT)
committerHyungwon Hwang <human.hwang@samsung.com>2014-12-23 02:09:28 (GMT)
commit87625668d48c1d080b84b10cdd3960d3f09d4ff9 (patch)
treea14f3dc258ee9ecbceb7a0e0567f0f6a3189f21b
parent8f212af171ccdfee5723d83d52682a8c9a308df6 (diff)
downloadlinux-3.10-87625668d48c1d080b84b10cdd3960d3f09d4ff9.zip
linux-3.10-87625668d48c1d080b84b10cdd3960d3f09d4ff9.tar.gz
linux-3.10-87625668d48c1d080b84b10cdd3960d3f09d4ff9.tar.bz2
ARM: EXYNOS: use four additional chipid bits to identify EXYNOS family
Use chipid[27:20] bits to identify the EXYNOS family while setting up the serial port during the uncompression setup. This uses four additional bits of chipid to identify the EXYNOS family since this is required for identifying EXYNOS5420 SoC. Change-Id: Ic7cc14e68d16ae3da2a7d2177b40e40b0295d9a8 Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org> Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> Reviewed-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r--arch/arm/mach-exynos/include/mach/uncompress.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-exynos/include/mach/uncompress.h b/arch/arm/mach-exynos/include/mach/uncompress.h
index 2979995..1937e0f 100644
--- a/arch/arm/mach-exynos/include/mach/uncompress.h
+++ b/arch/arm/mach-exynos/include/mach/uncompress.h
@@ -31,13 +31,12 @@ static void arch_detect_cpu(void)
/*
* product_id is bits 31:12
- * bits 23:20 describe the exynosX family
- *
+ * bits 23:20 describe the exynosX family
+ * bits 27:24 describe the exynosX family in exynos5420
*/
chip_id >>= 20;
- chip_id &= 0xf;
- if (chip_id == 0x5)
+ if ((chip_id & 0x0f) == 0x5 || (chip_id & 0xf0) == 0x50)
uart_base = (volatile u8 *)EXYNOS5_PA_UART + (S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT);
else
uart_base = (volatile u8 *)EXYNOS4_PA_UART + (S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT);