move_pwm_code_to_plat_s3c.patch

Since the pwm code in mach-2410 can be reused for 6410, move it to plat-s3c.

Signed-off-by: Balaji Rao <balajirrao@openmoko.org>

10 files changed, 15 insertions, 13 deletions

diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index ba58f9cac95..ea5d8f24f64 100644
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -10,7 +10,7 @@ config CPU_S3C2410
 	select CPU_ARM920T
 	select S3C2410_CLOCK
 	select S3C2410_GPIO
-	select S3C2410_PWM
+	select S3C_PWM
 	select CPU_LLSERIAL_S3C2410
 	select S3C2410_PM if PM
 	help
@@ -46,11 +46,6 @@ config MACH_BAST_IDE
 	  Internal node for machines with an BAST style IDE
 	  interface
 
-config S3C2410_PWM
-	bool
-	help
-	  PWM timer code for the S3C2410, and similar processors
-
 
 menu "S3C2410 Machines"
 
diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile
index 6c537ecb1af..8929c9041c4 100644
--- a/arch/arm/mach-s3c2410/Makefile
+++ b/arch/arm/mach-s3c2410/Makefile
@@ -16,7 +16,6 @@ obj-$(CONFIG_CPU_S3C2410_DMA)	+= dma.o
 obj-$(CONFIG_S3C2410_PM)	+= pm.o sleep.o
 obj-$(CONFIG_S3C2410_GPIO)	+= gpio.o
 #obj-$(CONFIG_S3C2410_CLOCK)	+= clock.o
-obj-$(CONFIG_S3C2410_PWM)	+= pwm.o
 
 # Machine support
 
diff --git a/arch/arm/mach-s3c2410/include/mach/fiq_ipc_gta02.h b/arch/arm/mach-s3c2410/include/mach/fiq_ipc_gta02.h
index e74aa2ccc40..401d1fbc050 100644
--- a/arch/arm/mach-s3c2410/include/mach/fiq_ipc_gta02.h
+++ b/arch/arm/mach-s3c2410/include/mach/fiq_ipc_gta02.h
@@ -16,7 +16,7 @@
  * for testing
  */
 
-#include <mach/pwm.h>
+#include <plat/pwm.h>
 #include <plat/regs-timer.h>
 
 extern u8 fiq_ready;
diff --git a/arch/arm/mach-s3c2442/Kconfig b/arch/arm/mach-s3c2442/Kconfig
index 27453f02326..991ed6a2d0b 100644
--- a/arch/arm/mach-s3c2442/Kconfig
+++ b/arch/arm/mach-s3c2442/Kconfig
@@ -41,7 +41,7 @@ config MACH_NEO1973_GTA02
 	select POWER_SUPPLY
 	select GTA02_HDQ
 	select MACH_NEO1973
-	select S3C2410_PWM
+	select S3C_PWM
 	select S3C2410_CLOCK
 	help
 	   Say Y here if you are using the FIC Neo1973 GSM Phone
diff --git a/arch/arm/mach-s3c2442/fiq_c_isr.c b/arch/arm/mach-s3c2442/fiq_c_isr.c
index 0decc35a317..e1728300ad0 100644
--- a/arch/arm/mach-s3c2442/fiq_c_isr.c
+++ b/arch/arm/mach-s3c2442/fiq_c_isr.c
@@ -19,7 +19,7 @@
 #include <plat/cpu.h>
 #include <plat/irq.h>
 
-#include <mach/pwm.h>
+#include <plat/pwm.h>
 #include <plat/regs-timer.h>
 
 /*
diff --git a/arch/arm/plat-s3c/Kconfig b/arch/arm/plat-s3c/Kconfig
index 05537018171..a0ecea9aa4d 100644
--- a/arch/arm/plat-s3c/Kconfig
+++ b/arch/arm/plat-s3c/Kconfig
@@ -159,6 +159,11 @@ config S3C_GPIO_CFG_S3C64XX
 	  Internal configuration to enable S3C64XX style GPIO configuration
 	  functions.
 
+config S3C_PWM
+	bool
+	help
+	  PWM timer code for the S3C2410, and similar processors
+
 # device definitions to compile in
 
 config S3C_DEV_HSMMC
diff --git a/arch/arm/plat-s3c/Makefile b/arch/arm/plat-s3c/Makefile
index c77fcae5529..cb5ea6cc7dd 100644
--- a/arch/arm/plat-s3c/Makefile
+++ b/arch/arm/plat-s3c/Makefile
@@ -31,3 +31,5 @@ obj-$(CONFIG_S3C_DEV_HSMMC1)	+= dev-hsmmc1.o
 obj-y				+= dev-i2c0.o
 obj-$(CONFIG_S3C_DEV_I2C1)	+= dev-i2c1.o
 obj-$(CONFIG_S3C_DEV_FB)	+= dev-fb.o
+
+obj-$(CONFIG_S3C_PWM)		+= pwm.o
diff --git a/arch/arm/mach-s3c2410/include/mach/pwm.h b/arch/arm/plat-s3c/include/plat/pwm.h
index 18c1bac8851..6a41b0ad840 100644
--- a/arch/arm/mach-s3c2410/include/mach/pwm.h
+++ b/arch/arm/plat-s3c/include/plat/pwm.h
@@ -9,7 +9,6 @@
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <plat/regs-timer.h>
-#include <mach/gta01.h>
 
 enum pwm_timer {
 	PWM0,
diff --git a/arch/arm/plat-s3c/include/plat/regs-timer.h b/arch/arm/plat-s3c/include/plat/regs-timer.h
index d097d92f8cc..75527d16f60 100644
--- a/arch/arm/plat-s3c/include/plat/regs-timer.h
+++ b/arch/arm/plat-s3c/include/plat/regs-timer.h
@@ -10,6 +10,8 @@
  * S3C2410 Timer configuration
 */
 
+#include <plat/map-base.h>
+
 #ifndef __ASM_ARCH_REGS_TIMER_H
 #define __ASM_ARCH_REGS_TIMER_H
 
diff --git a/arch/arm/mach-s3c2410/pwm.c b/arch/arm/plat-s3c/pwm.c
index 5d9ed5b653f..250bd2bc9b8 100644
--- a/arch/arm/mach-s3c2410/pwm.c
+++ b/arch/arm/plat-s3c/pwm.c
@@ -1,5 +1,5 @@
 /*
- * arch/arm/mach-s3c2410/3c2410-pwm.c
+ * arch/arm/plat-s3c/pwm.c
  *
  * Copyright (c) by Javi Roman <javiroman@kernel-labs.org>
  * 		 for the Openmoko Project.
@@ -23,7 +23,7 @@
 #include <linux/device.h>
 #include <mach/hardware.h>
 #include <plat/regs-timer.h>
-#include <mach/pwm.h>
+#include <plat/pwm.h>
 #include <asm/io.h>
 
 #ifdef CONFIG_PM