diff options
Diffstat (limited to 'arch/arm/mach-s3c24xx/s3c2412.c')
-rw-r--r-- | arch/arm/mach-s3c24xx/s3c2412.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/arch/arm/mach-s3c24xx/s3c2412.c b/arch/arm/mach-s3c24xx/s3c2412.c index 6c5f4031ff0c..0d592159a5c3 100644 --- a/arch/arm/mach-s3c24xx/s3c2412.c +++ b/arch/arm/mach-s3c24xx/s3c2412.c | |||
@@ -1,5 +1,4 @@ | |||
1 | /* linux/arch/arm/mach-s3c2412/s3c2412.c | 1 | /* |
2 | * | ||
3 | * Copyright (c) 2006 Simtec Electronics | 2 | * Copyright (c) 2006 Simtec Electronics |
4 | * Ben Dooks <ben@simtec.co.uk> | 3 | * Ben Dooks <ben@simtec.co.uk> |
5 | * | 4 | * |
@@ -28,28 +27,31 @@ | |||
28 | #include <asm/mach/map.h> | 27 | #include <asm/mach/map.h> |
29 | #include <asm/mach/irq.h> | 28 | #include <asm/mach/irq.h> |
30 | 29 | ||
31 | #include <mach/hardware.h> | ||
32 | #include <asm/proc-fns.h> | 30 | #include <asm/proc-fns.h> |
33 | #include <asm/irq.h> | 31 | #include <asm/irq.h> |
34 | #include <asm/system_misc.h> | 32 | #include <asm/system_misc.h> |
35 | 33 | ||
36 | #include <plat/cpu-freq.h> | 34 | #include <mach/hardware.h> |
37 | |||
38 | #include <mach/regs-clock.h> | 35 | #include <mach/regs-clock.h> |
39 | #include <plat/regs-serial.h> | ||
40 | #include <mach/regs-power.h> | ||
41 | #include <mach/regs-gpio.h> | 36 | #include <mach/regs-gpio.h> |
42 | #include <mach/regs-dsc.h> | ||
43 | #include <plat/regs-spi.h> | ||
44 | #include <mach/regs-s3c2412.h> | ||
45 | 37 | ||
46 | #include <plat/s3c2412.h> | 38 | #include <plat/clock.h> |
47 | #include <plat/cpu.h> | 39 | #include <plat/cpu.h> |
40 | #include <plat/cpu-freq.h> | ||
48 | #include <plat/devs.h> | 41 | #include <plat/devs.h> |
49 | #include <plat/clock.h> | ||
50 | #include <plat/pm.h> | ||
51 | #include <plat/pll.h> | ||
52 | #include <plat/nand-core.h> | 42 | #include <plat/nand-core.h> |
43 | #include <plat/pll.h> | ||
44 | #include <plat/pm.h> | ||
45 | #include <plat/regs-serial.h> | ||
46 | #include <plat/regs-spi.h> | ||
47 | #include <plat/s3c2412.h> | ||
48 | |||
49 | #include "common.h" | ||
50 | #include "regs-dsc.h" | ||
51 | #include "s3c2412-power.h" | ||
52 | |||
53 | #define S3C2412_SWRST (S3C24XX_VA_CLKPWR + 0x30) | ||
54 | #define S3C2412_SWRST_RESET (0x533C2412) | ||
53 | 55 | ||
54 | #ifndef CONFIG_CPU_S3C2412_ONLY | 56 | #ifndef CONFIG_CPU_S3C2412_ONLY |
55 | void __iomem *s3c24xx_va_gpio2 = S3C24XX_VA_GPIO; | 57 | void __iomem *s3c24xx_va_gpio2 = S3C24XX_VA_GPIO; |
@@ -244,8 +246,8 @@ int __init s3c2412_init(void) | |||
244 | 246 | ||
245 | #ifdef CONFIG_PM | 247 | #ifdef CONFIG_PM |
246 | register_syscore_ops(&s3c2412_pm_syscore_ops); | 248 | register_syscore_ops(&s3c2412_pm_syscore_ops); |
247 | #endif | ||
248 | register_syscore_ops(&s3c24xx_irq_syscore_ops); | 249 | register_syscore_ops(&s3c24xx_irq_syscore_ops); |
250 | #endif | ||
249 | 251 | ||
250 | return device_register(&s3c2412_dev); | 252 | return device_register(&s3c2412_dev); |
251 | } | 253 | } |