From 15038fb570748ce2fb9ce31200b1f075774a7f4d Mon Sep 17 00:00:00 2001
From: Jonas Bonn <jonas.bonn@gmail.com>
Date: Wed, 19 Nov 2008 17:11:03 +0000
Subject: Move asm/arch/pwm.h to mach/pwm.h

Signed-off-by: Jonas Bonn <jonas.bonn@gmail.com>
---
 arch/arm/mach-s3c2410/include/mach/pwm.h     | 40 ++++++++++++++++++++++++++++
 arch/arm/mach-s3c2410/pwm.c                  |  2 +-
 arch/arm/mach-s3c2440/fiq_c_isr.c            |  2 +-
 drivers/leds/leds-neo1973-vibrator.c         |  2 +-
 drivers/video/backlight/gta01_bl.c           |  2 +-
 include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h |  2 +-
 include/asm-arm/arch-s3c2410/pwm.h           | 40 ----------------------------
 7 files changed, 45 insertions(+), 45 deletions(-)
 create mode 100644 arch/arm/mach-s3c2410/include/mach/pwm.h
 delete mode 100644 include/asm-arm/arch-s3c2410/pwm.h

diff --git a/arch/arm/mach-s3c2410/include/mach/pwm.h b/arch/arm/mach-s3c2410/include/mach/pwm.h
new file mode 100644
index 00000000000..5689ce973d2
--- /dev/null
+++ b/arch/arm/mach-s3c2410/include/mach/pwm.h
@@ -0,0 +1,40 @@
+#ifndef __S3C2410_PWM_H
+#define __S3C2410_PWM_H
+
+#include <linux/err.h>
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+
+#include <mach/io.h>
+#include <mach/hardware.h>
+#include <asm/mach-types.h>
+#include <asm/plat-s3c/regs-timer.h>
+#include <mach/gta01.h>
+
+enum pwm_timer {
+	PWM0,
+	PWM1,
+	PWM2,
+	PWM3,
+	PWM4
+};
+
+struct s3c2410_pwm {
+	enum pwm_timer timerid;
+	struct clk *pclk;
+	unsigned long pclk_rate;
+	unsigned long prescaler;
+	unsigned long divider;
+	unsigned long counter;
+	unsigned long comparer;
+};
+
+int s3c2410_pwm_init(struct s3c2410_pwm *s3c2410_pwm);
+int s3c2410_pwm_enable(struct s3c2410_pwm *s3c2410_pwm);
+int s3c2410_pwm_disable(struct s3c2410_pwm *s3c2410_pwm);
+int s3c2410_pwm_start(struct s3c2410_pwm *s3c2410_pwm);
+int s3c2410_pwm_stop(struct s3c2410_pwm *s3c2410_pwm);
+int s3c2410_pwm_duty_cycle(int reg_value, struct s3c2410_pwm *s3c2410_pwm);
+int s3c2410_pwm_dumpregs(void);
+
+#endif /* __S3C2410_PWM_H */
diff --git a/arch/arm/mach-s3c2410/pwm.c b/arch/arm/mach-s3c2410/pwm.c
index 355f956abef..d6780841c69 100644
--- a/arch/arm/mach-s3c2410/pwm.c
+++ b/arch/arm/mach-s3c2410/pwm.c
@@ -23,7 +23,7 @@
 #include <linux/device.h>
 #include <mach/hardware.h>
 #include <asm/plat-s3c/regs-timer.h>
-#include <asm/arch-s3c2410/pwm.h>
+#include <mach/pwm.h>
 #include <asm/io.h>
 
 #ifdef CONFIG_PM
diff --git a/arch/arm/mach-s3c2440/fiq_c_isr.c b/arch/arm/mach-s3c2440/fiq_c_isr.c
index bb2b69df0c1..3db402748f6 100644
--- a/arch/arm/mach-s3c2440/fiq_c_isr.c
+++ b/arch/arm/mach-s3c2440/fiq_c_isr.c
@@ -19,7 +19,7 @@
 #include <asm/plat-s3c24xx/cpu.h>
 #include <asm/plat-s3c24xx/irq.h>
 
-#include <asm/arch-s3c2410/pwm.h>
+#include <mach/pwm.h>
 #include <asm/plat-s3c/regs-timer.h>
 
 /*
diff --git a/drivers/leds/leds-neo1973-vibrator.c b/drivers/leds/leds-neo1973-vibrator.c
index 06a4a2ce84d..f9247baeab1 100644
--- a/drivers/leds/leds-neo1973-vibrator.c
+++ b/drivers/leds/leds-neo1973-vibrator.c
@@ -19,7 +19,7 @@
 #include <linux/leds.h>
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
-#include <asm/arch-s3c2410/pwm.h>
+#include <mach/pwm.h>
 #include <mach/gta01.h>
 #include <asm/plat-s3c/regs-timer.h>
 
diff --git a/drivers/video/backlight/gta01_bl.c b/drivers/video/backlight/gta01_bl.c
index 2b9f8cd1dc1..a84ca7448ee 100644
--- a/drivers/video/backlight/gta01_bl.c
+++ b/drivers/video/backlight/gta01_bl.c
@@ -37,7 +37,7 @@
 
 #include <mach/hardware.h>
 #include <mach/gta01.h>
-#include <asm/arch/pwm.h>
+#include <mach/pwm.h>
 
 #include <asm/plat-s3c/regs-timer.h>
 #include <asm/plat-s3c24xx/neo1973.h>
diff --git a/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h b/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
index a96a0233919..8f7744eab63 100644
--- a/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
+++ b/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
@@ -16,7 +16,7 @@
  * for testing
  */
 
-#include <asm/arch-s3c2410/pwm.h>
+#include <mach/pwm.h>
 #include <asm/plat-s3c/regs-timer.h>
 
 extern u8 fiq_ready;
diff --git a/include/asm-arm/arch-s3c2410/pwm.h b/include/asm-arm/arch-s3c2410/pwm.h
deleted file mode 100644
index 5689ce973d2..00000000000
--- a/include/asm-arm/arch-s3c2410/pwm.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef __S3C2410_PWM_H
-#define __S3C2410_PWM_H
-
-#include <linux/err.h>
-#include <linux/platform_device.h>
-#include <linux/clk.h>
-
-#include <mach/io.h>
-#include <mach/hardware.h>
-#include <asm/mach-types.h>
-#include <asm/plat-s3c/regs-timer.h>
-#include <mach/gta01.h>
-
-enum pwm_timer {
-	PWM0,
-	PWM1,
-	PWM2,
-	PWM3,
-	PWM4
-};
-
-struct s3c2410_pwm {
-	enum pwm_timer timerid;
-	struct clk *pclk;
-	unsigned long pclk_rate;
-	unsigned long prescaler;
-	unsigned long divider;
-	unsigned long counter;
-	unsigned long comparer;
-};
-
-int s3c2410_pwm_init(struct s3c2410_pwm *s3c2410_pwm);
-int s3c2410_pwm_enable(struct s3c2410_pwm *s3c2410_pwm);
-int s3c2410_pwm_disable(struct s3c2410_pwm *s3c2410_pwm);
-int s3c2410_pwm_start(struct s3c2410_pwm *s3c2410_pwm);
-int s3c2410_pwm_stop(struct s3c2410_pwm *s3c2410_pwm);
-int s3c2410_pwm_duty_cycle(int reg_value, struct s3c2410_pwm *s3c2410_pwm);
-int s3c2410_pwm_dumpregs(void);
-
-#endif /* __S3C2410_PWM_H */
-- 
cgit v1.2.3