Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+43 -19
+1 -19
drivers/rtc/rtc-sh.c
··· 26 26 #include <asm/rtc.h> 27 27 28 28 #define DRV_NAME "sh-rtc" 29 - #define DRV_VERSION "0.1.5" 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 29 + #define DRV_VERSION "0.1.6" 48 30 49 31 #define RTC_REG(r) ((r) * rtc_reg_size) 50 32
+8
include/asm-sh/cpu-sh2/rtc.h
··· 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 */
+8
include/asm-sh/cpu-sh2a/rtc.h
··· 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 */
+8
include/asm-sh/cpu-sh3/rtc.h
··· 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 */
+8
include/asm-sh/cpu-sh4/rtc.h
··· 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 */
+8
include/asm-sh/cpu-sh5/rtc.h
··· 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 */
+2
include/asm-sh/rtc.h
··· 11 11 unsigned long capabilities; 12 12 }; 13 13 14 + #include <asm/cpu/rtc.h> 15 + 14 16 #endif /* _ASM_RTC_H */