diff options
author | Tomasz Figa <tomasz.figa@gmail.com> | 2013-03-08 14:35:16 -0500 |
---|---|---|
committer | Tomasz Figa <tomasz.figa@gmail.com> | 2013-08-12 15:53:24 -0400 |
commit | 61cb263162d581d4ab9d72f0d99ad344e6f50fb5 (patch) | |
tree | 09f3ddba162dedfb2e57dc7536cb94f744c8bc7c /arch | |
parent | 7c93c200f66c2b7f0e0de7ccc0d6718b151adc56 (diff) |
ARM: SAMSUNG: Remove remaining uses of plat/regs-timer.h header
This patch removes remaining inclusions of plat/regs-timer.h as
a preparation to remove the header.
As a part of this, things like save and restore of PWM registers are
removed from SoC-specific code, because it is handled in appropriate
drivers now.
Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Tested-by: Heiko Stuebner <heiko@sntech.de>
Tested-by: Mark Brown <broonie@linaro.org>
Tested-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-s3c64xx/irq-pm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s5p64x0/pm.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/pm.c | 10 | ||||
-rw-r--r-- | arch/arm/plat-samsung/s5p-irq.c | 1 |
4 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/mach-s3c64xx/irq-pm.c b/arch/arm/mach-s3c64xx/irq-pm.c index 0c7e1d960ca4..c3da1b68d03e 100644 --- a/arch/arm/mach-s3c64xx/irq-pm.c +++ b/arch/arm/mach-s3c64xx/irq-pm.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <mach/map.h> | 22 | #include <mach/map.h> |
23 | 23 | ||
24 | #include <plat/regs-serial.h> | 24 | #include <plat/regs-serial.h> |
25 | #include <plat/regs-timer.h> | ||
26 | #include <mach/regs-gpio.h> | 25 | #include <mach/regs-gpio.h> |
27 | #include <plat/cpu.h> | 26 | #include <plat/cpu.h> |
28 | #include <plat/pm.h> | 27 | #include <plat/pm.h> |
@@ -43,7 +42,6 @@ static struct sleep_save irq_save[] = { | |||
43 | SAVE_ITEM(S3C64XX_EINT0FLTCON2), | 42 | SAVE_ITEM(S3C64XX_EINT0FLTCON2), |
44 | SAVE_ITEM(S3C64XX_EINT0FLTCON3), | 43 | SAVE_ITEM(S3C64XX_EINT0FLTCON3), |
45 | SAVE_ITEM(S3C64XX_EINT0MASK), | 44 | SAVE_ITEM(S3C64XX_EINT0MASK), |
46 | SAVE_ITEM(S3C64XX_TINT_CSTAT), | ||
47 | }; | 45 | }; |
48 | 46 | ||
49 | static struct irq_grp_save { | 47 | static struct irq_grp_save { |
diff --git a/arch/arm/mach-s5p64x0/pm.c b/arch/arm/mach-s5p64x0/pm.c index 97c2a08ad490..861e15cea691 100644 --- a/arch/arm/mach-s5p64x0/pm.c +++ b/arch/arm/mach-s5p64x0/pm.c | |||
@@ -18,7 +18,6 @@ | |||
18 | 18 | ||
19 | #include <plat/cpu.h> | 19 | #include <plat/cpu.h> |
20 | #include <plat/pm.h> | 20 | #include <plat/pm.h> |
21 | #include <plat/regs-timer.h> | ||
22 | #include <plat/wakeup-mask.h> | 21 | #include <plat/wakeup-mask.h> |
23 | 22 | ||
24 | #include <mach/regs-clock.h> | 23 | #include <mach/regs-clock.h> |
@@ -48,8 +47,6 @@ static struct sleep_save s5p64x0_misc_save[] = { | |||
48 | SAVE_ITEM(S5P64X0_MEM0CONSLP1), | 47 | SAVE_ITEM(S5P64X0_MEM0CONSLP1), |
49 | SAVE_ITEM(S5P64X0_MEM0DRVCON), | 48 | SAVE_ITEM(S5P64X0_MEM0DRVCON), |
50 | SAVE_ITEM(S5P64X0_MEM1DRVCON), | 49 | SAVE_ITEM(S5P64X0_MEM1DRVCON), |
51 | |||
52 | SAVE_ITEM(S3C64XX_TINT_CSTAT), | ||
53 | }; | 50 | }; |
54 | 51 | ||
55 | /* DPLL is present only in S5P6450 */ | 52 | /* DPLL is present only in S5P6450 */ |
diff --git a/arch/arm/mach-s5pv210/pm.c b/arch/arm/mach-s5pv210/pm.c index 2b68a67b6e95..3cf3f9c8ddd1 100644 --- a/arch/arm/mach-s5pv210/pm.c +++ b/arch/arm/mach-s5pv210/pm.c | |||
@@ -21,7 +21,6 @@ | |||
21 | 21 | ||
22 | #include <plat/cpu.h> | 22 | #include <plat/cpu.h> |
23 | #include <plat/pm.h> | 23 | #include <plat/pm.h> |
24 | #include <plat/regs-timer.h> | ||
25 | 24 | ||
26 | #include <mach/regs-irq.h> | 25 | #include <mach/regs-irq.h> |
27 | #include <mach/regs-clock.h> | 26 | #include <mach/regs-clock.h> |
@@ -77,15 +76,6 @@ static struct sleep_save s5pv210_core_save[] = { | |||
77 | /* Clock ETC */ | 76 | /* Clock ETC */ |
78 | SAVE_ITEM(S5P_CLK_OUT), | 77 | SAVE_ITEM(S5P_CLK_OUT), |
79 | SAVE_ITEM(S5P_MDNIE_SEL), | 78 | SAVE_ITEM(S5P_MDNIE_SEL), |
80 | |||
81 | /* PWM Register */ | ||
82 | SAVE_ITEM(S3C2410_TCFG0), | ||
83 | SAVE_ITEM(S3C2410_TCFG1), | ||
84 | SAVE_ITEM(S3C64XX_TINT_CSTAT), | ||
85 | SAVE_ITEM(S3C2410_TCON), | ||
86 | SAVE_ITEM(S3C2410_TCNTB(0)), | ||
87 | SAVE_ITEM(S3C2410_TCMPB(0)), | ||
88 | SAVE_ITEM(S3C2410_TCNTO(0)), | ||
89 | }; | 79 | }; |
90 | 80 | ||
91 | static int s5pv210_cpu_suspend(unsigned long arg) | 81 | static int s5pv210_cpu_suspend(unsigned long arg) |
diff --git a/arch/arm/plat-samsung/s5p-irq.c b/arch/arm/plat-samsung/s5p-irq.c index 6729cb2aab56..ddfaca9c79d8 100644 --- a/arch/arm/plat-samsung/s5p-irq.c +++ b/arch/arm/plat-samsung/s5p-irq.c | |||
@@ -17,7 +17,6 @@ | |||
17 | 17 | ||
18 | #include <mach/irqs.h> | 18 | #include <mach/irqs.h> |
19 | #include <mach/map.h> | 19 | #include <mach/map.h> |
20 | #include <plat/regs-timer.h> | ||
21 | #include <plat/cpu.h> | 20 | #include <plat/cpu.h> |
22 | 21 | ||
23 | void __init s5p_init_irq(u32 *vic, u32 num_vic) | 22 | void __init s5p_init_irq(u32 *vic, u32 num_vic) |