diff options
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) | |||
215 | 215 | ||
216 | void __init s3c24xx_init_io(struct map_desc *mach_desc, int size) | 216 | void __init s3c24xx_init_io(struct map_desc *mach_desc, int size) |
217 | { | 217 | { |
218 | unsigned long idcode = 0x0; | ||
219 | |||
220 | /* initialise the io descriptors we need for initialisation */ | 218 | /* initialise the io descriptors we need for initialisation */ |
221 | iotable_init(mach_desc, size); | 219 | iotable_init(mach_desc, size); |
222 | iotable_init(s3c_iodesc, ARRAY_SIZE(s3c_iodesc)); | 220 | iotable_init(s3c_iodesc, ARRAY_SIZE(s3c_iodesc)); |
223 | 221 | ||
224 | if (cpu_architecture() >= CPU_ARCH_ARMv5) { | 222 | if (cpu_architecture() >= CPU_ARCH_ARMv5) { |
225 | idcode = s3c24xx_read_idcode_v5(); | 223 | samsung_cpu_id = s3c24xx_read_idcode_v5(); |
226 | } else { | 224 | } else { |
227 | idcode = s3c24xx_read_idcode_v4(); | 225 | samsung_cpu_id = s3c24xx_read_idcode_v4(); |
228 | } | 226 | } |
227 | s3c24xx_init_cpu(); | ||
229 | 228 | ||
230 | arm_pm_restart = s3c24xx_pm_restart; | 229 | arm_pm_restart = s3c24xx_pm_restart; |
231 | 230 | ||
232 | s3c_init_cpu(idcode, cpu_ids, ARRAY_SIZE(cpu_ids)); | 231 | s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids)); |
233 | } | 232 | } |