diff options
Diffstat (limited to 'arch/arm/mach-exynos/include/mach')
-rw-r--r-- | arch/arm/mach-exynos/include/mach/uncompress.h | 7 |
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 2979995d5a6a..1937e0fb7375 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) | |||
31 | 31 | ||
32 | /* | 32 | /* |
33 | * product_id is bits 31:12 | 33 | * product_id is bits 31:12 |
34 | * bits 23:20 describe the exynosX family | 34 | * bits 23:20 describe the exynosX family |
35 | * | 35 | * bits 27:24 describe the exynosX family in exynos5420 |
36 | */ | 36 | */ |
37 | chip_id >>= 20; | 37 | chip_id >>= 20; |
38 | chip_id &= 0xf; | ||
39 | 38 | ||
40 | if (chip_id == 0x5) | 39 | if ((chip_id & 0x0f) == 0x5 || (chip_id & 0xf0) == 0x50) |
41 | uart_base = (volatile u8 *)EXYNOS5_PA_UART + (S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT); | 40 | uart_base = (volatile u8 *)EXYNOS5_PA_UART + (S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT); |
42 | else | 41 | else |
43 | uart_base = (volatile u8 *)EXYNOS4_PA_UART + (S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT); | 42 | uart_base = (volatile u8 *)EXYNOS4_PA_UART + (S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT); |