diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 20:14:11 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 20:14:11 +0900 |
| commit | c9477f38cba225870862fd9e08868ae3d4abdfe0 (patch) | |
| tree | 01c7575a1e8e3197d072890f48944f1232a885c6 /arch/arm/plat-s3c24xx | |
| parent | c37b25046289e857918d25fd96aa441ea7929ad5 (diff) | |
| parent | 2520123382e97271e932377c83bca010c265be55 (diff) | |
| download | linux-c9477f38cba225870862fd9e08868ae3d4abdfe0.tar.gz linux-c9477f38cba225870862fd9e08868ae3d4abdfe0.tar.bz2 linux-c9477f38cba225870862fd9e08868ae3d4abdfe0.zip | |
Merge branch 'next-samsung-board' into next-samsung-devel-2
Diffstat (limited to 'arch/arm/plat-s3c24xx')
| -rw-r--r-- | arch/arm/plat-s3c24xx/cpu.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/plat-s3c24xx/cpu.c b/arch/arm/plat-s3c24xx/cpu.c index c1fc6c6fac72..3c6335307fb1 100644 --- a/arch/arm/plat-s3c24xx/cpu.c +++ b/arch/arm/plat-s3c24xx/cpu.c @@ -215,19 +215,18 @@ 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(); } + s3c24xx_init_cpu(); 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)); } |