diff options
author | Paul Mundt <lethal@linux-sh.org> | 2007-11-28 05:14:23 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-01-27 23:18:58 -0500 |
commit | c019fd8839503a91c556ae68d773e3bbb9b476e1 (patch) | |
tree | 79a32fc7436c5eb0d94c9aeb91617b8698ffd89f | |
parent | 3ee7702903c346fc814bd7540ba37eebef75054d (diff) |
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>
-rw-r--r-- | drivers/rtc/rtc-sh.c | 20 | ||||
-rw-r--r-- | include/asm-sh/cpu-sh2/rtc.h | 8 | ||||
-rw-r--r-- | include/asm-sh/cpu-sh2a/rtc.h | 8 | ||||
-rw-r--r-- | include/asm-sh/cpu-sh3/rtc.h | 8 | ||||
-rw-r--r-- | include/asm-sh/cpu-sh4/rtc.h | 8 | ||||
-rw-r--r-- | include/asm-sh/cpu-sh5/rtc.h | 8 | ||||
-rw-r--r-- | include/asm-sh/rtc.h | 2 |
7 files changed, 43 insertions, 19 deletions
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c index af9bc57c8920..c1d6a1880ccf 100644 --- a/drivers/rtc/rtc-sh.c +++ b/drivers/rtc/rtc-sh.c | |||
@@ -26,25 +26,7 @@ | |||
26 | #include <asm/rtc.h> | 26 | #include <asm/rtc.h> |
27 | 27 | ||
28 | #define DRV_NAME "sh-rtc" | 28 | #define DRV_NAME "sh-rtc" |
29 | #define DRV_VERSION "0.1.5" | 29 | #define DRV_VERSION "0.1.6" |
30 | |||
31 | #ifdef CONFIG_CPU_SH2A | ||
32 | #define rtc_reg_size sizeof(u16) | ||
33 | #define RTC_BIT_INVERTED 0 | ||
34 | #define RTC_DEF_CAPABILITIES RTC_CAP_4_DIGIT_YEAR | ||
35 | #elif defined(CONFIG_CPU_SH3) | ||
36 | #define rtc_reg_size sizeof(u16) | ||
37 | #define RTC_BIT_INVERTED 0 /* No bug on SH7708, SH7709A */ | ||
38 | #define RTC_DEF_CAPABILITIES 0UL | ||
39 | #elif defined(CONFIG_CPU_SH4) | ||
40 | #define rtc_reg_size sizeof(u32) | ||
41 | #define RTC_BIT_INVERTED 0x40 /* bug on SH7750, SH7750S */ | ||
42 | #define RTC_DEF_CAPABILITIES RTC_CAP_4_DIGIT_YEAR | ||
43 | #elif defined(CONFIG_CPU_SH5) | ||
44 | #define rtc_reg_size sizeof(u32) | ||
45 | #define RTC_BIT_INVERTED 0 /* The SH-5 RTC is surprisingly sane! */ | ||
46 | #define RTC_DEF_CAPABILITIES RTC_CAP_4_DIGIT_YEAR | ||
47 | #endif | ||
48 | 30 | ||
49 | #define RTC_REG(r) ((r) * rtc_reg_size) | 31 | #define RTC_REG(r) ((r) * rtc_reg_size) |
50 | 32 | ||
diff --git a/include/asm-sh/cpu-sh2/rtc.h b/include/asm-sh/cpu-sh2/rtc.h new file mode 100644 index 000000000000..39e2d6e94782 --- /dev/null +++ b/include/asm-sh/cpu-sh2/rtc.h | |||
@@ -0,0 +1,8 @@ | |||
1 | #ifndef __ASM_SH_CPU_SH2_RTC_H | ||
2 | #define __ASM_SH_CPU_SH2_RTC_H | ||
3 | |||
4 | #define rtc_reg_size sizeof(u16) | ||
5 | #define RTC_BIT_INVERTED 0 | ||
6 | #define RTC_DEF_CAPABILITIES 0UL | ||
7 | |||
8 | #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 index 000000000000..afb511e2bed7 --- /dev/null +++ b/include/asm-sh/cpu-sh2a/rtc.h | |||
@@ -0,0 +1,8 @@ | |||
1 | #ifndef __ASM_SH_CPU_SH2A_RTC_H | ||
2 | #define __ASM_SH_CPU_SH2A_RTC_H | ||
3 | |||
4 | #define rtc_reg_size sizeof(u16) | ||
5 | #define RTC_BIT_INVERTED 0 | ||
6 | #define RTC_DEF_CAPABILITIES RTC_CAP_4_DIGIT_YEAR | ||
7 | |||
8 | #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 index 000000000000..319404aaee37 --- /dev/null +++ b/include/asm-sh/cpu-sh3/rtc.h | |||
@@ -0,0 +1,8 @@ | |||
1 | #ifndef __ASM_SH_CPU_SH3_RTC_H | ||
2 | #define __ASM_SH_CPU_SH3_RTC_H | ||
3 | |||
4 | #define rtc_reg_size sizeof(u16) | ||
5 | #define RTC_BIT_INVERTED 0 /* No bug on SH7708, SH7709A */ | ||
6 | #define RTC_DEF_CAPABILITIES 0UL | ||
7 | |||
8 | #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 index 000000000000..f3d0f53275e4 --- /dev/null +++ b/include/asm-sh/cpu-sh4/rtc.h | |||
@@ -0,0 +1,8 @@ | |||
1 | #ifndef __ASM_SH_CPU_SH4_RTC_H | ||
2 | #define __ASM_SH_CPU_SH4_RTC_H | ||
3 | |||
4 | #define rtc_reg_size sizeof(u32) | ||
5 | #define RTC_BIT_INVERTED 0x40 /* bug on SH7750, SH7750S */ | ||
6 | #define RTC_DEF_CAPABILITIES RTC_CAP_4_DIGIT_YEAR | ||
7 | |||
8 | #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 index 000000000000..12ea0ed144e1 --- /dev/null +++ b/include/asm-sh/cpu-sh5/rtc.h | |||
@@ -0,0 +1,8 @@ | |||
1 | #ifndef __ASM_SH_CPU_SH5_RTC_H | ||
2 | #define __ASM_SH_CPU_SH5_RTC_H | ||
3 | |||
4 | #define rtc_reg_size sizeof(u32) | ||
5 | #define RTC_BIT_INVERTED 0 /* The SH-5 RTC is surprisingly sane! */ | ||
6 | #define RTC_DEF_CAPABILITIES RTC_CAP_4_DIGIT_YEAR | ||
7 | |||
8 | #endif /* __ASM_SH_CPU_SH5_RTC_H */ | ||
diff --git a/include/asm-sh/rtc.h b/include/asm-sh/rtc.h index 858da99d37e0..ec45ba8e11d9 100644 --- a/include/asm-sh/rtc.h +++ b/include/asm-sh/rtc.h | |||
@@ -11,4 +11,6 @@ struct sh_rtc_platform_info { | |||
11 | unsigned long capabilities; | 11 | unsigned long capabilities; |
12 | }; | 12 | }; |
13 | 13 | ||
14 | #include <asm/cpu/rtc.h> | ||
15 | |||
14 | #endif /* _ASM_RTC_H */ | 16 | #endif /* _ASM_RTC_H */ |