diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-02-13 13:30:54 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-02-13 13:30:54 +0100 |
| commit | d53ccdb341cf16e32c0ca2d6099b194d9572fe0c (patch) | |
| tree | 1ef7ca4c54463e02d0da5f6351ac5bebc5418c76 /arch/arm/include/asm/arch-exynos/cpu.h | |
| parent | 7bc5c8c93032a7b86e268a172955e15b84f1aac3 (diff) | |
| parent | e25bfecf7ba54a5b56cf991af8a2f2bb22994293 (diff) | |
| download | olio-uboot-2014.01-d53ccdb341cf16e32c0ca2d6099b194d9572fe0c.tar.xz olio-uboot-2014.01-d53ccdb341cf16e32c0ca2d6099b194d9572fe0c.zip | |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
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 573f75553..bccce63f2 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 */ |