diff options
| author | Tom Rini <trini@ti.com> | 2014-02-17 14:22:02 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-02-17 14:22:02 -0500 |
| commit | c4d376fd1c2bce8d64cec0431dd3f24957b6dec4 (patch) | |
| tree | de17e3a67fa4a48f3b9571bff2399cb0a24558bc /arch/arm/include/asm/arch-exynos/cpu.h | |
| parent | b1ad03c242dae3712b9be66026f5d8c6f919c00b (diff) | |
| parent | 5e77a745b24d9b98aa635293972f04fd6f0c6b38 (diff) | |
| download | blackbird-obmc-uboot-c4d376fd1c2bce8d64cec0431dd3f24957b6dec4.tar.gz blackbird-obmc-uboot-c4d376fd1c2bce8d64cec0431dd3f24957b6dec4.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/include/asm/arch-exynos/cpu.h')
| -rw-r--r-- | arch/arm/include/asm/arch-exynos/cpu.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/include/asm/arch-exynos/cpu.h b/arch/arm/include/asm/arch-exynos/cpu.h index 573f75553b..bccce63f2c 100644 --- a/arch/arm/include/asm/arch-exynos/cpu.h +++ b/arch/arm/include/asm/arch-exynos/cpu.h @@ -185,9 +185,11 @@ static inline int s5p_get_cpu_rev(void) static inline void s5p_set_cpu_id(void) { - unsigned int pro_id = (readl(EXYNOS4_PRO_ID) & 0x00FFF000) >> 12; + unsigned int pro_id = readl(EXYNOS4_PRO_ID); + unsigned int cpu_id = (pro_id & 0x00FFF000) >> 12; + unsigned int cpu_rev = pro_id & 0x000000FF; - switch (pro_id) { + switch (cpu_id) { case 0x200: /* Exynos4210 EVT0 */ s5p_cpu_id = 0x4210; @@ -196,10 +198,12 @@ static inline void s5p_set_cpu_id(void) case 0x210: /* Exynos4210 EVT1 */ s5p_cpu_id = 0x4210; + s5p_cpu_rev = cpu_rev; break; case 0x412: /* Exynos4412 */ s5p_cpu_id = 0x4412; + s5p_cpu_rev = cpu_rev; break; case 0x520: /* Exynos5250 */ |
