rtc: s3c: make header file local

Nothing outside of the rtc driver includes plat/regs-rtc.h,
so we can simply move the file into the same directory,
which allows us to build the file as platform-independent
code.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: rtc-linux@googlegroups.com
Cc: Alessandro Zummo <a.zummo@towertech.it>

diff --git a/arch/arm/plat-samsung/include/plat/regs-rtc.h b/arch/arm/plat-samsung/include/plat/regs-rtc.h
deleted file mode 100644 (file)
index 0f8263e..0000000
--- a/arch/arm/plat-samsung/include/plat/regs-rtc.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/regs-rtc.h
- *
- * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk>
- *                   http://www.simtec.co.uk/products/SWLINUX/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * S3C2410 Internal RTC register definition
-*/
-
-#ifndef __ASM_ARCH_REGS_RTC_H
-#define __ASM_ARCH_REGS_RTC_H __FILE__
-
-#define S3C2410_RTCREG(x) (x)
-#define S3C2410_INTP           S3C2410_RTCREG(0x30)
-#define S3C2410_INTP_ALM       (1 << 1)
-#define S3C2410_INTP_TIC       (1 << 0)
-
-#define S3C2410_RTCCON         S3C2410_RTCREG(0x40)
-#define S3C2410_RTCCON_RTCEN   (1 << 0)
-#define S3C2410_RTCCON_CNTSEL  (1 << 2)
-#define S3C2410_RTCCON_CLKRST  (1 << 3)
-#define S3C2443_RTCCON_TICSEL  (1 << 4)
-#define S3C64XX_RTCCON_TICEN   (1 << 8)
-
-#define S3C2410_TICNT          S3C2410_RTCREG(0x44)
-#define S3C2410_TICNT_ENABLE   (1 << 7)
-
-/* S3C2443: tick count is 15 bit wide
- * TICNT[6:0] contains upper 7 bits
- * TICNT1[7:0] contains lower 8 bits
- */
-#define S3C2443_TICNT_PART(x)  ((x & 0x7f00) >> 8)
-#define S3C2443_TICNT1         S3C2410_RTCREG(0x4C)
-#define S3C2443_TICNT1_PART(x) (x & 0xff)
-
-/* S3C2416: tick count is 32 bit wide
- * TICNT[6:0] contains bits [14:8]
- * TICNT1[7:0] contains lower 8 bits
- * TICNT2[16:0] contains upper 17 bits
- */
-#define S3C2416_TICNT2         S3C2410_RTCREG(0x48)
-#define S3C2416_TICNT2_PART(x) ((x & 0xffff8000) >> 15)
-
-#define S3C2410_RTCALM         S3C2410_RTCREG(0x50)
-#define S3C2410_RTCALM_ALMEN   (1 << 6)
-#define S3C2410_RTCALM_YEAREN  (1 << 5)
-#define S3C2410_RTCALM_MONEN   (1 << 4)
-#define S3C2410_RTCALM_DAYEN   (1 << 3)
-#define S3C2410_RTCALM_HOUREN  (1 << 2)
-#define S3C2410_RTCALM_MINEN   (1 << 1)
-#define S3C2410_RTCALM_SECEN   (1 << 0)
-
-#define S3C2410_ALMSEC         S3C2410_RTCREG(0x54)
-#define S3C2410_ALMMIN         S3C2410_RTCREG(0x58)
-#define S3C2410_ALMHOUR                S3C2410_RTCREG(0x5c)
-
-#define S3C2410_ALMDATE                S3C2410_RTCREG(0x60)
-#define S3C2410_ALMMON         S3C2410_RTCREG(0x64)
-#define S3C2410_ALMYEAR                S3C2410_RTCREG(0x68)
-
-#define S3C2410_RTCSEC         S3C2410_RTCREG(0x70)
-#define S3C2410_RTCMIN         S3C2410_RTCREG(0x74)
-#define S3C2410_RTCHOUR                S3C2410_RTCREG(0x78)
-#define S3C2410_RTCDATE                S3C2410_RTCREG(0x7c)
-#define S3C2410_RTCMON         S3C2410_RTCREG(0x84)
-#define S3C2410_RTCYEAR                S3C2410_RTCREG(0x88)
-
-#endif /* __ASM_ARCH_REGS_RTC_H */

diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index fb994e9ddc156de9a98465531db161202826fe57..7995f79d07e10d4e1f09888ea673a8ad95986cd9 100644 (file)
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -29,9 +29,8 @@
 #include <linux/uaccess.h>
 #include <linux/io.h>
 
-#include <mach/hardware.h>
 #include <asm/irq.h>
-#include <plat/regs-rtc.h>
+#include "rtc-s3c.h"
 
 enum s3c_cpu_type {
        TYPE_S3C2410,

diff --git a/drivers/rtc/rtc-s3c.h b/drivers/rtc/rtc-s3c.h
new file mode 100644 (file)
index 0000000..004b61a
--- /dev/null
+++ b/drivers/rtc/rtc-s3c.h
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk>
+ *                   http://www.simtec.co.uk/products/SWLINUX/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * S3C2410 Internal RTC register definition
+*/
+
+#ifndef __ASM_ARCH_REGS_RTC_H
+#define __ASM_ARCH_REGS_RTC_H __FILE__
+
+#define S3C2410_RTCREG(x) (x)
+#define S3C2410_INTP           S3C2410_RTCREG(0x30)
+#define S3C2410_INTP_ALM       (1 << 1)
+#define S3C2410_INTP_TIC       (1 << 0)
+
+#define S3C2410_RTCCON         S3C2410_RTCREG(0x40)
+#define S3C2410_RTCCON_RTCEN   (1 << 0)
+#define S3C2410_RTCCON_CNTSEL  (1 << 2)
+#define S3C2410_RTCCON_CLKRST  (1 << 3)
+#define S3C2443_RTCCON_TICSEL  (1 << 4)
+#define S3C64XX_RTCCON_TICEN   (1 << 8)
+
+#define S3C2410_TICNT          S3C2410_RTCREG(0x44)
+#define S3C2410_TICNT_ENABLE   (1 << 7)
+
+/* S3C2443: tick count is 15 bit wide
+ * TICNT[6:0] contains upper 7 bits
+ * TICNT1[7:0] contains lower 8 bits
+ */
+#define S3C2443_TICNT_PART(x)  ((x & 0x7f00) >> 8)
+#define S3C2443_TICNT1         S3C2410_RTCREG(0x4C)
+#define S3C2443_TICNT1_PART(x) (x & 0xff)
+
+/* S3C2416: tick count is 32 bit wide
+ * TICNT[6:0] contains bits [14:8]
+ * TICNT1[7:0] contains lower 8 bits
+ * TICNT2[16:0] contains upper 17 bits
+ */
+#define S3C2416_TICNT2         S3C2410_RTCREG(0x48)
+#define S3C2416_TICNT2_PART(x) ((x & 0xffff8000) >> 15)
+
+#define S3C2410_RTCALM         S3C2410_RTCREG(0x50)
+#define S3C2410_RTCALM_ALMEN   (1 << 6)
+#define S3C2410_RTCALM_YEAREN  (1 << 5)
+#define S3C2410_RTCALM_MONEN   (1 << 4)
+#define S3C2410_RTCALM_DAYEN   (1 << 3)
+#define S3C2410_RTCALM_HOUREN  (1 << 2)
+#define S3C2410_RTCALM_MINEN   (1 << 1)
+#define S3C2410_RTCALM_SECEN   (1 << 0)
+
+#define S3C2410_ALMSEC         S3C2410_RTCREG(0x54)
+#define S3C2410_ALMMIN         S3C2410_RTCREG(0x58)
+#define S3C2410_ALMHOUR                S3C2410_RTCREG(0x5c)
+
+#define S3C2410_ALMDATE                S3C2410_RTCREG(0x60)
+#define S3C2410_ALMMON         S3C2410_RTCREG(0x64)
+#define S3C2410_ALMYEAR                S3C2410_RTCREG(0x68)
+
+#define S3C2410_RTCSEC         S3C2410_RTCREG(0x70)
+#define S3C2410_RTCMIN         S3C2410_RTCREG(0x74)
+#define S3C2410_RTCHOUR                S3C2410_RTCREG(0x78)
+#define S3C2410_RTCDATE                S3C2410_RTCREG(0x7c)
+#define S3C2410_RTCMON         S3C2410_RTCREG(0x84)
+#define S3C2410_RTCYEAR                S3C2410_RTCREG(0x88)
+
+#endif /* __ASM_ARCH_REGS_RTC_H */