Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-24 19:37:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Exynos: fix cpuinfo and cpu detecting

Browse source 
Since Exynos architecture have new SoCs,
need to fix cpuinfo correctly.

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Tested-by: Jaehoon Chung <jh80.chung@samsung.com>
Cc: Chander Kashyap <chander.kashyap@linaro.org>
This commit is contained in:
Minkyu Kang 2012-04-26 15:48:32 +09:00 • committed by Albert ARIBAUD
parent 8c318eb3a0
commit 7775831dd3
3 changed files with 36 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/arm/cpu/armv7/s5p-common/cpu_info.c
View file

@ -48,8 +48,9 @@ int print_cpuinfo(void)
{ {
char buf[32]; char buf[32];
printf("CPU:\tS5P%X@%sMHz\n", printf("CPU:\t%s%X@%sMHz\n",
s5p_cpu_id, strmhz(buf, get_arm_clk())); s5p_get_cpu_name(), s5p_cpu_id,
strmhz(buf, get_arm_clk()));
return 0; return 0;
} }

40
arch/arm/include/asm/arch-exynos/cpu.h
View file

@ -24,6 +24,7 @@
#define DEVICE_NOT_AVAILABLE 0 #define DEVICE_NOT_AVAILABLE 0
#define EXYNOS_CPU_NAME "Exynos"
#define EXYNOS4_ADDR_BASE 0x10000000 #define EXYNOS4_ADDR_BASE 0x10000000
/* EXYNOS4 */ /* EXYNOS4 */
@ -93,29 +94,42 @@ static inline int s5p_get_cpu_rev(void)
static inline void s5p_set_cpu_id(void) static inline void s5p_set_cpu_id(void)
{ {
s5p_cpu_id = readl(EXYNOS4_PRO_ID); unsigned int pro_id = (readl(EXYNOS4_PRO_ID) & 0x00FFF000) >> 12;
s5p_cpu_id = (0xC000 | ((s5p_cpu_id & 0x00FFF000) >> 12));
/* switch (pro_id) {
* 0xC200: EXYNOS4210 EVT0 case 0x200:
* 0xC210: EXYNOS4210 EVT1 /* Exynos4210 EVT0 */
*/ s5p_cpu_id = 0x4210;
if (s5p_cpu_id == 0xC200) {
s5p_cpu_id |= 0x10;
s5p_cpu_rev = 0; s5p_cpu_rev = 0;
} else if (s5p_cpu_id == 0xC210) { break;
s5p_cpu_rev = 1; case 0x210:
/* Exynos4210 EVT1 */
s5p_cpu_id = 0x4210;
break;
case 0x412:
/* Exynos4412 */
s5p_cpu_id = 0x4412;
break;
case 0x520:
/* Exynos5250 */
s5p_cpu_id = 0x5250;
break;
} }
} }
static inline char *s5p_get_cpu_name(void)
{
return EXYNOS_CPU_NAME;
}
#define IS_SAMSUNG_TYPE(type, id) \ #define IS_SAMSUNG_TYPE(type, id) \
static inline int cpu_is_##type(void) \ static inline int cpu_is_##type(void) \
{ \ { \
return s5p_cpu_id == id ? 1 : 0; \ return (s5p_cpu_id >> 12) == id; \
} }
IS_SAMSUNG_TYPE(exynos4, 0xc210) IS_SAMSUNG_TYPE(exynos4, 0x4)
IS_SAMSUNG_TYPE(exynos5, 0xc520) IS_SAMSUNG_TYPE(exynos5, 0x5)
#define SAMSUNG_BASE(device, base) \ #define SAMSUNG_BASE(device, base) \
static inline unsigned int samsung_get_base_##device(void) \ static inline unsigned int samsung_get_base_##device(void) \

6
arch/arm/include/asm/arch-s5pc1xx/cpu.h
View file

@ -23,6 +23,7 @@
#ifndef _S5PC1XX_CPU_H #ifndef _S5PC1XX_CPU_H
#define _S5PC1XX_CPU_H #define _S5PC1XX_CPU_H
#define S5P_CPU_NAME "S5P"
#define S5PC1XX_ADDR_BASE 0xE0000000 #define S5PC1XX_ADDR_BASE 0xE0000000
/* S5PC100 */ /* S5PC100 */
@ -71,6 +72,11 @@ static inline void s5p_set_cpu_id(void)
s5p_cpu_id = 0xC000 | ((s5p_cpu_id & 0x00FFF000) >> 12); s5p_cpu_id = 0xC000 | ((s5p_cpu_id & 0x00FFF000) >> 12);
} }
static inline char *s5p_get_cpu_name(void)
{
return S5P_CPU_NAME;
}
#define IS_SAMSUNG_TYPE(type, id) \ #define IS_SAMSUNG_TYPE(type, id) \
static inline int cpu_is_##type(void) \ static inline int cpu_is_##type(void) \
{ \ { \