diff options
| author | Kukjin Kim | 2011-08-19 19:18:18 +0200 |
|---|---|---|
| committer | Kukjin Kim | 2011-08-22 00:14:07 +0200 |
| commit | c06af3cc6a27991187fd513765fed943684d41bf (patch) | |
| tree | 1bdcaab50fd7ba121218c8ee23f19df9caaf149b /arch/arm/plat-s3c24xx | |
| parent | Linux 3.1-rc2 (diff) | |
| download | kernel-qcow2-linux-c06af3cc6a27991187fd513765fed943684d41bf.tar.gz kernel-qcow2-linux-c06af3cc6a27991187fd513765fed943684d41bf.tar.xz kernel-qcow2-linux-c06af3cc6a27991187fd513765fed943684d41bf.zip | |
ARM: SAMSUNG: Add support for detecting CPU at runtime
The soc_is_[name]() can be used to distinguish cpu at runtime.
This patch was originally from Changhwan Youn <chaos.youn@samsung.com>
Acked-by: Changhwan Youn <chaos.youn@samsung.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/plat-s3c24xx')
| -rw-r--r-- | arch/arm/plat-s3c24xx/cpu.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/plat-s3c24xx/cpu.c b/arch/arm/plat-s3c24xx/cpu.c index c1fc6c6fac72..ead21a4a7f8a 100644 --- a/arch/arm/plat-s3c24xx/cpu.c +++ b/arch/arm/plat-s3c24xx/cpu.c @@ -215,19 +215,17 @@ static void s3c24xx_pm_restart(char mode, const char *cmd) void __init s3c24xx_init_io(struct map_desc *mach_desc, int size) { - unsigned long idcode = 0x0; - /* initialise the io descriptors we need for initialisation */ iotable_init(mach_desc, size); iotable_init(s3c_iodesc, ARRAY_SIZE(s3c_iodesc)); if (cpu_architecture() >= CPU_ARCH_ARMv5) { - idcode = s3c24xx_read_idcode_v5(); + samsung_cpu_id = s3c24xx_read_idcode_v5(); } else { - idcode = s3c24xx_read_idcode_v4(); + samsung_cpu_id = s3c24xx_read_idcode_v4(); } arm_pm_restart = s3c24xx_pm_restart; - s3c_init_cpu(idcode, cpu_ids, ARRAY_SIZE(cpu_ids)); + s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids)); } |