From: Arnd Bergmann <arnd@arndb.de>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
tony.luck@intel.com, geert@linux-m68k.org, jejb@parisc-linux.org,
deller@gmx.de, benh@kernel.crashing.org, mpe@ellerman.id.au,
dalias@libc.org, dhowells@redhat.com,
yasutake.koichi@jp.panasonic.com, rth@twiddle.net,
ink@jurassic.park.msu.ru, linux-alpha@vger.kernel.org,
x86@kernel.org, a.zummo@towertech.it,
alexandre.belloni@free-electrons.com,
linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org,
linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-sh@vger.kernel.org, rtc-linux@googlegroups.com,
linux-arch@vger.kernel.org
Subject: [PATCH 5/8] char/genrtc: powerpc: use asm-generic/rtc.h
Date: Tue, 26 Apr 2016 23:44:09 +0200 [thread overview]
Message-ID: <1461707052-1337718-6-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1461707052-1337718-1-git-send-email-arnd@arndb.de>
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@arndb.de>
---
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
next prev parent reply other threads:[~2016-04-26 21:45 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-26 21:44 char: legacy RTC cleanups Arnd Bergmann
2016-04-26 21:44 ` [PATCH 1/8] char/rtc: replace blacklist with whitelist Arnd Bergmann
2016-04-27 8:31 ` Alexandre Belloni
2016-04-26 21:44 ` [PATCH 2/8] char/rtc: legacy RTC is no longer supported on x86 Arnd Bergmann
2016-04-27 8:35 ` Alexandre Belloni
2016-04-27 10:05 ` Thomas Gleixner
2016-04-26 21:44 ` [PATCH 3/8] char/rtc: remove empty asm/mc146818rtc.h files Arnd Bergmann
2016-04-27 8:41 ` Alexandre Belloni
2016-04-26 21:44 ` [PATCH 4/8] char/rtc: move mc146818rtc code out of asm-generic/rtc.h Arnd Bergmann
2016-04-27 9:29 ` Alexandre Belloni
2016-04-27 9:59 ` Arnd Bergmann
2016-04-26 21:44 ` Arnd Bergmann [this message]
2016-04-26 21:44 ` [PATCH 6/8] char/genrtc: parisc: use asm-generic/rtc.h Arnd Bergmann
2016-04-26 22:07 ` Rolf Eike Beer
2016-04-27 11:21 ` Arnd Bergmann
2016-04-27 11:35 ` Arnd Bergmann
2016-04-27 11:55 ` Geert Uytterhoeven
2016-04-27 12:44 ` Arnd Bergmann
2016-04-26 21:44 ` [PATCH 7/8] char/genrtc: disallow building on Alpha Arnd Bergmann
2016-04-26 21:44 ` [PATCH 8/8] char/genrtc: disallow building on mn10300 Arnd Bergmann
2016-04-27 7:54 ` char: legacy RTC cleanups Geert Uytterhoeven
2016-04-27 8:33 ` Arnd Bergmann
2016-04-27 8:41 ` Geert Uytterhoeven
2016-04-27 9:44 ` Alexandre Belloni
2016-04-27 10:07 ` Arnd Bergmann
2016-04-27 10:19 ` Geert Uytterhoeven
2016-04-27 11:30 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461707052-1337718-6-git-send-email-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@free-electrons.com \
--cc=benh@kernel.crashing.org \
--cc=dalias@libc.org \
--cc=deller@gmx.de \
--cc=dhowells@redhat.com \
--cc=geert@linux-m68k.org \
--cc=gregkh@linuxfoundation.org \
--cc=ink@jurassic.park.msu.ru \
--cc=jejb@parisc-linux.org \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=rtc-linux@googlegroups.com \
--cc=rth@twiddle.net \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
--cc=yasutake.koichi@jp.panasonic.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).