The asm-generic/rtc.h header can now be included by architectures that provide their own set_rtc_time/get_rtc_time macros, letting us remove most of the common contents in the powerpc implementation. Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx> --- arch/powerpc/include/asm/rtc.h | 36 +++++------------------------------- 1 file changed, 5 insertions(+), 31 deletions(-) diff --git a/arch/powerpc/include/asm/rtc.h b/arch/powerpc/include/asm/rtc.h index f5802926b6c0..c6659582bd1e 100644 --- a/arch/powerpc/include/asm/rtc.h +++ b/arch/powerpc/include/asm/rtc.h @@ -26,23 +26,14 @@ #ifdef __KERNEL__ -#include <linux/rtc.h> +#define get_rtc_time powerpc_get_rtc_time +#define set_rtc_time powerpc_set_rtc_time +#include <asm-generic/rtc.h> #include <asm/machdep.h> #include <asm/time.h> -#define RTC_PIE 0x40 /* periodic interrupt enable */ -#define RTC_AIE 0x20 /* alarm interrupt enable */ -#define RTC_UIE 0x10 /* update-finished interrupt enable */ - -/* some dummy definitions */ -#define RTC_BATT_BAD 0x100 /* battery bad */ -#define RTC_SQWE 0x08 /* enable square-wave output */ -#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */ -#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */ -#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */ - -static inline unsigned int get_rtc_time(struct rtc_time *time) +static inline unsigned int powerpc_get_rtc_time(struct rtc_time *time) { if (ppc_md.get_rtc_time) ppc_md.get_rtc_time(time); @@ -50,29 +41,12 @@ static inline unsigned int get_rtc_time(struct rtc_time *time) } /* Set the current date and time in the real time clock. */ -static inline int set_rtc_time(struct rtc_time *time) +static inline int powerpc_set_rtc_time(struct rtc_time *time) { if (ppc_md.set_rtc_time) return ppc_md.set_rtc_time(time); return -EINVAL; } -static inline unsigned int get_rtc_ss(void) -{ - struct rtc_time h; - - get_rtc_time(&h); - return h.tm_sec; -} - -static inline int get_rtc_pll(struct rtc_pll_info *pll) -{ - return -EINVAL; -} -static inline int set_rtc_pll(struct rtc_pll_info *pll) -{ - return -EINVAL; -} - #endif /* __KERNEL__ */ #endif /* __ASM_POWERPC_RTC_H__ */ -- 2.7.0 -- To unsubscribe from this list: send the line "unsubscribe linux-ia64" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
![]() |