diff options
Diffstat (limited to 'arch/arm/mach-s5pc100')
-rw-r--r-- | arch/arm/mach-s5pc100/common.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s5pc100/include/mach/debug-macro.S | 2 | ||||
-rw-r--r-- | arch/arm/mach-s5pc100/include/mach/tick.h | 31 | ||||
-rw-r--r-- | arch/arm/mach-s5pc100/mach-smdkc100.c | 2 |
4 files changed, 3 insertions, 34 deletions
diff --git a/arch/arm/mach-s5pc100/common.c b/arch/arm/mach-s5pc100/common.c index c5a8eeacf81c..6a41bf7dacf6 100644 --- a/arch/arm/mach-s5pc100/common.c +++ b/arch/arm/mach-s5pc100/common.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
23 | #include <linux/device.h> | 23 | #include <linux/device.h> |
24 | #include <linux/serial_core.h> | 24 | #include <linux/serial_core.h> |
25 | #include <linux/serial_s3c.h> | ||
25 | #include <clocksource/samsung_pwm.h> | 26 | #include <clocksource/samsung_pwm.h> |
26 | #include <linux/platform_device.h> | 27 | #include <linux/platform_device.h> |
27 | #include <linux/sched.h> | 28 | #include <linux/sched.h> |
@@ -49,7 +50,6 @@ | |||
49 | #include <plat/onenand-core.h> | 50 | #include <plat/onenand-core.h> |
50 | #include <plat/pwm-core.h> | 51 | #include <plat/pwm-core.h> |
51 | #include <plat/spi-core.h> | 52 | #include <plat/spi-core.h> |
52 | #include <plat/regs-serial.h> | ||
53 | #include <plat/watchdog-reset.h> | 53 | #include <plat/watchdog-reset.h> |
54 | 54 | ||
55 | #include "common.h" | 55 | #include "common.h" |
diff --git a/arch/arm/mach-s5pc100/include/mach/debug-macro.S b/arch/arm/mach-s5pc100/include/mach/debug-macro.S index 66cb7f16bf2a..22c23859e45e 100644 --- a/arch/arm/mach-s5pc100/include/mach/debug-macro.S +++ b/arch/arm/mach-s5pc100/include/mach/debug-macro.S | |||
@@ -13,8 +13,8 @@ | |||
13 | 13 | ||
14 | /* pull in the relevant register and map files. */ | 14 | /* pull in the relevant register and map files. */ |
15 | 15 | ||
16 | #include <linux/serial_s3c.h> | ||
16 | #include <mach/map.h> | 17 | #include <mach/map.h> |
17 | #include <plat/regs-serial.h> | ||
18 | 18 | ||
19 | /* note, for the boot process to work we have to keep the UART | 19 | /* note, for the boot process to work we have to keep the UART |
20 | * virtual address aligned to an 1MiB boundary for the L1 | 20 | * virtual address aligned to an 1MiB boundary for the L1 |
diff --git a/arch/arm/mach-s5pc100/include/mach/tick.h b/arch/arm/mach-s5pc100/include/mach/tick.h deleted file mode 100644 index 0af8e41230ed..000000000000 --- a/arch/arm/mach-s5pc100/include/mach/tick.h +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | /* linux/arch/arm/mach-s5pc100/include/mach/tick.h | ||
2 | * | ||
3 | * Copyright 2009 Samsung Electronics Co. | ||
4 | * Byungho Min <bhmin@samsung.com> | ||
5 | * | ||
6 | * S3C64XX - Timer tick support definitions | ||
7 | * | ||
8 | * Based on mach-s3c6400/include/mach/tick.h | ||
9 | * | ||
10 | * This program is free software; you can redistribute it and/or modify | ||
11 | * it under the terms of the GNU General Public License version 2 as | ||
12 | * published by the Free Software Foundation. | ||
13 | */ | ||
14 | |||
15 | #ifndef __ASM_ARCH_TICK_H | ||
16 | #define __ASM_ARCH_TICK_H __FILE__ | ||
17 | |||
18 | #include <linux/irqchip/arm-vic.h> | ||
19 | |||
20 | /* note, the timer interrutps turn up in 2 places, the vic and then | ||
21 | * the timer block. We take the VIC as the base at the moment. | ||
22 | */ | ||
23 | static inline u32 s3c24xx_ostimer_pending(void) | ||
24 | { | ||
25 | u32 pend = __raw_readl(VA_VIC0 + VIC_RAW_STATUS); | ||
26 | return pend & (1 << (IRQ_TIMER4_VIC - S5P_IRQ_VIC0(0))); | ||
27 | } | ||
28 | |||
29 | #define TICK_MAX (0xffffffff) | ||
30 | |||
31 | #endif /* __ASM_ARCH_TICK_H */ | ||
diff --git a/arch/arm/mach-s5pc100/mach-smdkc100.c b/arch/arm/mach-s5pc100/mach-smdkc100.c index 9e256b9fc930..668af3ac31f3 100644 --- a/arch/arm/mach-s5pc100/mach-smdkc100.c +++ b/arch/arm/mach-s5pc100/mach-smdkc100.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/timer.h> | 16 | #include <linux/timer.h> |
17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
18 | #include <linux/serial_core.h> | 18 | #include <linux/serial_core.h> |
19 | #include <linux/serial_s3c.h> | ||
19 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
20 | #include <linux/io.h> | 21 | #include <linux/io.h> |
21 | #include <linux/gpio.h> | 22 | #include <linux/gpio.h> |
@@ -37,7 +38,6 @@ | |||
37 | #include <asm/irq.h> | 38 | #include <asm/irq.h> |
38 | #include <asm/mach-types.h> | 39 | #include <asm/mach-types.h> |
39 | 40 | ||
40 | #include <plat/regs-serial.h> | ||
41 | #include <plat/gpio-cfg.h> | 41 | #include <plat/gpio-cfg.h> |
42 | 42 | ||
43 | #include <plat/clock.h> | 43 | #include <plat/clock.h> |