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>

diff --git a/arch/arm/mach-s3c64xx/irq-pm.c b/arch/arm/mach-s3c64xx/irq-pm.c
index 0c7e1d960ca49f025bd1412039f2b0c21a142fa4..c3da1b68d03e0b352490b0df0e5ee8f1741ad87f 100644 (file)
--- a/arch/arm/mach-s3c64xx/irq-pm.c
+++ b/arch/arm/mach-s3c64xx/irq-pm.c
@@ -22,7 +22,6 @@
 #include <mach/map.h>
 
 #include <plat/regs-serial.h>
-#include <plat/regs-timer.h>
 #include <mach/regs-gpio.h>
 #include <plat/cpu.h>
 #include <plat/pm.h>
@@ -43,7 +42,6 @@ static struct sleep_save irq_save[] = {
        SAVE_ITEM(S3C64XX_EINT0FLTCON2),
        SAVE_ITEM(S3C64XX_EINT0FLTCON3),
        SAVE_ITEM(S3C64XX_EINT0MASK),
-       SAVE_ITEM(S3C64XX_TINT_CSTAT),
 };
 
 static struct irq_grp_save {

diff --git a/arch/arm/mach-s5p64x0/pm.c b/arch/arm/mach-s5p64x0/pm.c
index 97c2a08ad4903a6e23839bc96b12e454f8c1135a..861e15cea691e62331e293b9639e7d1eb1f07bcb 100644 (file)
--- a/arch/arm/mach-s5p64x0/pm.c
+++ b/arch/arm/mach-s5p64x0/pm.c
@@ -18,7 +18,6 @@
 
 #include <plat/cpu.h>
 #include <plat/pm.h>
-#include <plat/regs-timer.h>
 #include <plat/wakeup-mask.h>
 
 #include <mach/regs-clock.h>
@@ -48,8 +47,6 @@ static struct sleep_save s5p64x0_misc_save[] = {
        SAVE_ITEM(S5P64X0_MEM0CONSLP1),
        SAVE_ITEM(S5P64X0_MEM0DRVCON),
        SAVE_ITEM(S5P64X0_MEM1DRVCON),
-
-       SAVE_ITEM(S3C64XX_TINT_CSTAT),
 };
 
 /* DPLL is present only in S5P6450 */

diff --git a/arch/arm/mach-s5pv210/pm.c b/arch/arm/mach-s5pv210/pm.c
index 2b68a67b6e953fe992494f9bcca2744c6abb1e8a..3cf3f9c8ddd124e84e7124514544377cfcc4d430 100644 (file)
--- a/arch/arm/mach-s5pv210/pm.c
+++ b/arch/arm/mach-s5pv210/pm.c
@@ -21,7 +21,6 @@
 
 #include <plat/cpu.h>
 #include <plat/pm.h>
-#include <plat/regs-timer.h>
 
 #include <mach/regs-irq.h>
 #include <mach/regs-clock.h>
@@ -77,15 +76,6 @@ static struct sleep_save s5pv210_core_save[] = {
        /* Clock ETC */
        SAVE_ITEM(S5P_CLK_OUT),
        SAVE_ITEM(S5P_MDNIE_SEL),
-
-       /* PWM Register */
-       SAVE_ITEM(S3C2410_TCFG0),
-       SAVE_ITEM(S3C2410_TCFG1),
-       SAVE_ITEM(S3C64XX_TINT_CSTAT),
-       SAVE_ITEM(S3C2410_TCON),
-       SAVE_ITEM(S3C2410_TCNTB(0)),
-       SAVE_ITEM(S3C2410_TCMPB(0)),
-       SAVE_ITEM(S3C2410_TCNTO(0)),
 };
 
 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 6729cb2aab56cf232a12d142937f2ee70ddf6f4d..ddfaca9c79d82b0149651b70c168836fdd46d581 100644 (file)
--- a/arch/arm/plat-samsung/s5p-irq.c
+++ b/arch/arm/plat-samsung/s5p-irq.c
@@ -17,7 +17,6 @@
 
 #include <mach/irqs.h>
 #include <mach/map.h>
-#include <plat/regs-timer.h>
 #include <plat/cpu.h>
 
 void __init s5p_init_irq(u32 *vic, u32 num_vic)