rtc: rtc-sh: Split out the CPU defs to asm/cpu/.

With all of the different CPU types this was getting a but unwieldly.
Since sh64 is now integrated, we don't have to worry about multiple
architectures caring about the header definitions.

Split out the defs for each asm/cpu/ to make rtc-sh slightly less
visually offensive.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
index af9bc57c892095ec93869ba9341af8ddb3de18a8..c1d6a1880ccf45e4953c929422f89d878856b5e5 100644 (file)
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
@@ -26,25 +26,7 @@
 #include <asm/rtc.h>
 
 #define DRV_NAME       "sh-rtc"
-#define DRV_VERSION    "0.1.5"
-
-#ifdef CONFIG_CPU_SH2A
-#define rtc_reg_size           sizeof(u16)
-#define RTC_BIT_INVERTED       0
-#define RTC_DEF_CAPABILITIES   RTC_CAP_4_DIGIT_YEAR
-#elif defined(CONFIG_CPU_SH3)
-#define rtc_reg_size           sizeof(u16)
-#define RTC_BIT_INVERTED       0       /* No bug on SH7708, SH7709A */
-#define RTC_DEF_CAPABILITIES   0UL
-#elif defined(CONFIG_CPU_SH4)
-#define rtc_reg_size           sizeof(u32)
-#define RTC_BIT_INVERTED       0x40    /* bug on SH7750, SH7750S */
-#define RTC_DEF_CAPABILITIES   RTC_CAP_4_DIGIT_YEAR
-#elif defined(CONFIG_CPU_SH5)
-#define rtc_reg_size           sizeof(u32)
-#define RTC_BIT_INVERTED       0       /* The SH-5 RTC is surprisingly sane! */
-#define RTC_DEF_CAPABILITIES   RTC_CAP_4_DIGIT_YEAR
-#endif
+#define DRV_VERSION    "0.1.6"
 
 #define RTC_REG(r)     ((r) * rtc_reg_size)
 

diff --git a/include/asm-sh/cpu-sh2/rtc.h b/include/asm-sh/cpu-sh2/rtc.h
new file mode 100644 (file)
index 0000000..39e2d6e
--- /dev/null
+++ b/include/asm-sh/cpu-sh2/rtc.h
@@ -0,0 +1,8 @@
+#ifndef __ASM_SH_CPU_SH2_RTC_H
+#define __ASM_SH_CPU_SH2_RTC_H
+
+#define rtc_reg_size           sizeof(u16)
+#define RTC_BIT_INVERTED       0
+#define RTC_DEF_CAPABILITIES   0UL
+
+#endif /* __ASM_SH_CPU_SH2_RTC_H */

diff --git a/include/asm-sh/cpu-sh2a/rtc.h b/include/asm-sh/cpu-sh2a/rtc.h
new file mode 100644 (file)
index 0000000..afb511e
--- /dev/null
+++ b/include/asm-sh/cpu-sh2a/rtc.h
@@ -0,0 +1,8 @@
+#ifndef __ASM_SH_CPU_SH2A_RTC_H
+#define __ASM_SH_CPU_SH2A_RTC_H
+
+#define rtc_reg_size           sizeof(u16)
+#define RTC_BIT_INVERTED       0
+#define RTC_DEF_CAPABILITIES   RTC_CAP_4_DIGIT_YEAR
+
+#endif /* __ASM_SH_CPU_SH2A_RTC_H */

diff --git a/include/asm-sh/cpu-sh3/rtc.h b/include/asm-sh/cpu-sh3/rtc.h
new file mode 100644 (file)
index 0000000..319404a
--- /dev/null
+++ b/include/asm-sh/cpu-sh3/rtc.h
@@ -0,0 +1,8 @@
+#ifndef __ASM_SH_CPU_SH3_RTC_H
+#define __ASM_SH_CPU_SH3_RTC_H
+
+#define rtc_reg_size           sizeof(u16)
+#define RTC_BIT_INVERTED       0       /* No bug on SH7708, SH7709A */
+#define RTC_DEF_CAPABILITIES   0UL
+
+#endif /* __ASM_SH_CPU_SH3_RTC_H */

diff --git a/include/asm-sh/cpu-sh4/rtc.h b/include/asm-sh/cpu-sh4/rtc.h
new file mode 100644 (file)
index 0000000..f3d0f53
--- /dev/null
+++ b/include/asm-sh/cpu-sh4/rtc.h
@@ -0,0 +1,8 @@
+#ifndef __ASM_SH_CPU_SH4_RTC_H
+#define __ASM_SH_CPU_SH4_RTC_H
+
+#define rtc_reg_size           sizeof(u32)
+#define RTC_BIT_INVERTED       0x40    /* bug on SH7750, SH7750S */
+#define RTC_DEF_CAPABILITIES   RTC_CAP_4_DIGIT_YEAR
+
+#endif /* __ASM_SH_CPU_SH4_RTC_H */

diff --git a/include/asm-sh/cpu-sh5/rtc.h b/include/asm-sh/cpu-sh5/rtc.h
new file mode 100644 (file)
index 0000000..12ea0ed
--- /dev/null
+++ b/include/asm-sh/cpu-sh5/rtc.h
@@ -0,0 +1,8 @@
+#ifndef __ASM_SH_CPU_SH5_RTC_H
+#define __ASM_SH_CPU_SH5_RTC_H
+
+#define rtc_reg_size           sizeof(u32)
+#define RTC_BIT_INVERTED       0       /* The SH-5 RTC is surprisingly sane! */
+#define RTC_DEF_CAPABILITIES   RTC_CAP_4_DIGIT_YEAR
+
+#endif /* __ASM_SH_CPU_SH5_RTC_H */

diff --git a/include/asm-sh/rtc.h b/include/asm-sh/rtc.h
index 858da99d37e0f7f07c1a4b79439aec70fad67cc6..ec45ba8e11d93884f8c6c46f7e84366c586ca6ed 100644 (file)
--- a/include/asm-sh/rtc.h
+++ b/include/asm-sh/rtc.h
@@ -11,4 +11,6 @@ struct sh_rtc_platform_info {
        unsigned long capabilities;
 };
 
+#include <asm/cpu/rtc.h>
+
 #endif /* _ASM_RTC_H */