From 9ba4da348b0b8397499868360a080f96fcced6db Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Wed, 28 Nov 2007 19:14:23 +0900 Subject: [PATCH] --- yaml --- r: 77810 b: refs/heads/master c: c019fd8839503a91c556ae68d773e3bbb9b476e1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-sh.c | 20 +------------------- trunk/include/asm-sh/cpu-sh2/rtc.h | 8 ++++++++ trunk/include/asm-sh/cpu-sh2a/rtc.h | 8 ++++++++ trunk/include/asm-sh/cpu-sh3/rtc.h | 8 ++++++++ trunk/include/asm-sh/cpu-sh4/rtc.h | 8 ++++++++ trunk/include/asm-sh/cpu-sh5/rtc.h | 8 ++++++++ trunk/include/asm-sh/rtc.h | 2 ++ 8 files changed, 44 insertions(+), 20 deletions(-) create mode 100644 trunk/include/asm-sh/cpu-sh2/rtc.h create mode 100644 trunk/include/asm-sh/cpu-sh2a/rtc.h create mode 100644 trunk/include/asm-sh/cpu-sh3/rtc.h create mode 100644 trunk/include/asm-sh/cpu-sh4/rtc.h create mode 100644 trunk/include/asm-sh/cpu-sh5/rtc.h diff --git a/[refs] b/[refs] index 00f51774b313..e834759cfc3a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ee7702903c346fc814bd7540ba37eebef75054d +refs/heads/master: c019fd8839503a91c556ae68d773e3bbb9b476e1 diff --git a/trunk/drivers/rtc/rtc-sh.c b/trunk/drivers/rtc/rtc-sh.c index af9bc57c8920..c1d6a1880ccf 100644 --- a/trunk/drivers/rtc/rtc-sh.c +++ b/trunk/drivers/rtc/rtc-sh.c @@ -26,25 +26,7 @@ #include #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/trunk/include/asm-sh/cpu-sh2/rtc.h b/trunk/include/asm-sh/cpu-sh2/rtc.h new file mode 100644 index 000000000000..39e2d6e94782 --- /dev/null +++ b/trunk/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/trunk/include/asm-sh/cpu-sh2a/rtc.h b/trunk/include/asm-sh/cpu-sh2a/rtc.h new file mode 100644 index 000000000000..afb511e2bed7 --- /dev/null +++ b/trunk/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/trunk/include/asm-sh/cpu-sh3/rtc.h b/trunk/include/asm-sh/cpu-sh3/rtc.h new file mode 100644 index 000000000000..319404aaee37 --- /dev/null +++ b/trunk/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/trunk/include/asm-sh/cpu-sh4/rtc.h b/trunk/include/asm-sh/cpu-sh4/rtc.h new file mode 100644 index 000000000000..f3d0f53275e4 --- /dev/null +++ b/trunk/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/trunk/include/asm-sh/cpu-sh5/rtc.h b/trunk/include/asm-sh/cpu-sh5/rtc.h new file mode 100644 index 000000000000..12ea0ed144e1 --- /dev/null +++ b/trunk/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/trunk/include/asm-sh/rtc.h b/trunk/include/asm-sh/rtc.h index 858da99d37e0..ec45ba8e11d9 100644 --- a/trunk/include/asm-sh/rtc.h +++ b/trunk/include/asm-sh/rtc.h @@ -11,4 +11,6 @@ struct sh_rtc_platform_info { unsigned long capabilities; }; +#include + #endif /* _ASM_RTC_H */