summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/arch-s5pc1xx/cpu.h
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-02-13 13:30:54 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-02-13 13:30:54 +0100
commitd53ccdb341cf16e32c0ca2d6099b194d9572fe0c (patch)
tree1ef7ca4c54463e02d0da5f6351ac5bebc5418c76 /arch/arm/include/asm/arch-s5pc1xx/cpu.h
parent7bc5c8c93032a7b86e268a172955e15b84f1aac3 (diff)
parente25bfecf7ba54a5b56cf991af8a2f2bb22994293 (diff)
downloadolio-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-s5pc1xx/cpu.h')
-rw-r--r--arch/arm/include/asm/arch-s5pc1xx/cpu.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-s5pc1xx/cpu.h b/arch/arm/include/asm/arch-s5pc1xx/cpu.h
index 4fc5a0c3c..5ae5c8716 100644
--- a/arch/arm/include/asm/arch-s5pc1xx/cpu.h
+++ b/arch/arm/include/asm/arch-s5pc1xx/cpu.h
@@ -51,10 +51,17 @@
#include <asm/io.h>
/* CPU detection macros */
extern unsigned int s5p_cpu_id;
+extern unsigned int s5p_cpu_rev;
+
+static inline int s5p_get_cpu_rev(void)
+{
+ return s5p_cpu_rev;
+}
static inline void s5p_set_cpu_id(void)
{
s5p_cpu_id = readl(S5PC100_PRO_ID);
+ s5p_cpu_rev = s5p_cpu_id & 0x000000FF;
s5p_cpu_id = 0xC000 | ((s5p_cpu_id & 0x00FFF000) >> 12);
}