Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / arch / arm / cpu / armv7 / s5p-common / cpu_info.c

diff --git a/arch/arm/cpu/armv7/s5p-common/cpu_info.c b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
index 454175ca5cde8259949f1305a5418278f3a9feee..2f6c7085546af48580587d23f1847b5b09397801 100644 (file)
--- a/arch/arm/cpu/armv7/s5p-common/cpu_info.c
+++ b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
@@ -25,15 +25,14 @@
 #include <asm/arch/clk.h>
 
 /* Default is s5pc100 */
-unsigned int s5pc1xx_cpu_id = 0xC100;
+unsigned int s5p_cpu_id = 0xC100;
 
 #ifdef CONFIG_ARCH_CPU_INIT
 int arch_cpu_init(void)
 {
-       s5pc1xx_cpu_id = readl(samsung_get_base_pro_id());
-       s5pc1xx_cpu_id = 0xC000 | ((s5pc1xx_cpu_id & 0x00FFF000) >> 12);
+       s5p_set_cpu_id();
 
-       s5pc1xx_clock_init();
+       s5p_clock_init();
 
        return 0;
 }
@@ -41,7 +40,7 @@ int arch_cpu_init(void)
 
 u32 get_device_type(void)
 {
-       return s5pc1xx_cpu_id;
+       return s5p_cpu_id;
 }
 
 #ifdef CONFIG_DISPLAY_CPUINFO
@@ -50,7 +49,7 @@ int print_cpuinfo(void)
        char buf[32];
 
        printf("CPU:\tS5P%X@%sMHz\n",
-                       s5pc1xx_cpu_id, strmhz(buf, get_arm_clk()));
+                       s5p_cpu_id, strmhz(buf, get_arm_clk()));
 
        return 0;
 }