1 files changed, 16 insertions, 1 deletions

diff --git a/arch/arm/mach-exynos/include/mach/uncompress.h b/arch/arm/mach-exynos/include/mach/uncompress.h
index 493f4f365ddf..2979995d5a6a 100644
--- a/arch/arm/mach-exynos/include/mach/uncompress.h
+++ b/arch/arm/mach-exynos/include/mach/uncompress.h
@@ -20,9 +20,24 @@ volatile u8 *uart_base;
 
 #include <plat/uncompress.h>
 
+static unsigned int __raw_readl(unsigned int ptr)
+{
+        return *((volatile unsigned int *)ptr);
+}
+
 static void arch_detect_cpu(void)
 {
-        if (machine_is_smdk5250())
+        u32 chip_id = __raw_readl(EXYNOS_PA_CHIPID);
+
+        /*
+         * product_id is bits 31:12
+         *    bits 23:20 describe the exynosX family
+         *
+         */
+        chip_id >>= 20;
+        chip_id &= 0xf;
+
+        if (chip_id == 0x5)
                 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);