Commit 084b3600 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Alexandre Belloni

char/genrtc: remove m68k support

The asm/rtc.h header is only used for the old gen_rtc driver
that has been replaced by rtc-generic. According to Geert
Uytterhoeven, nobody has used the old driver on m68k for
a long time, so we can now just remove the header file
and disallow the driver in Kconfig.

All files that used to include asm/rtc.h are now changed so
they include the headers that were used implicitly through
asm/rtc.h.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Tested-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent 598e8a1f
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <asm/amigahw.h> #include <asm/amigahw.h>
#include <asm/amigaints.h> #include <asm/amigaints.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/rtc.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/io.h> #include <asm/io.h>
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/apollohw.h> #include <asm/apollohw.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/rtc.h>
#include <asm/machdep.h> #include <asm/machdep.h>
u_long sio01_physaddr; u_long sio01_physaddr;
......
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/traps.h> #include <asm/traps.h>
#include <asm/rtc.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/bvme6000hw.h> #include <asm/bvme6000hw.h>
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <linux/string.h> #include <linux/string.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/console.h> #include <linux/console.h>
#include <linux/rtc.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/bootinfo-hp300.h> #include <asm/bootinfo-hp300.h>
...@@ -20,7 +21,6 @@ ...@@ -20,7 +21,6 @@
#include <asm/blinken.h> #include <asm/blinken.h>
#include <asm/io.h> /* readb() and writeb() */ #include <asm/io.h> /* readb() and writeb() */
#include <asm/hp300hw.h> #include <asm/hp300hw.h>
#include <asm/rtc.h>
#include "time.h" #include "time.h"
......
/* include/asm-m68k/rtc.h
*
* Copyright Richard Zidlicky
* implementation details for genrtc/q40rtc driver
*/
/* permission is hereby granted to copy, modify and redistribute this code
* in terms of the GNU Library General Public License, Version 2 or later,
* at your option.
*/
#ifndef _ASM_RTC_H
#define _ASM_RTC_H
#ifdef __KERNEL__
#include <linux/rtc.h>
#include <asm/errno.h>
#include <asm/machdep.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)
{
/*
* Only the values that we read from the RTC are set. We leave
* tm_wday, tm_yday and tm_isdst untouched. Even though the
* RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated
* by the RTC when initially set to a non-zero value.
*/
if (mach_hwclk)
mach_hwclk(0, time);
return RTC_24H;
}
static inline int set_rtc_time(struct rtc_time *time)
{
if (mach_hwclk)
return mach_hwclk(1, time);
return -EINVAL;
}
static inline unsigned int get_rtc_ss(void)
{
if (mach_get_ss)
return mach_get_ss();
else{
struct rtc_time h;
get_rtc_time(&h);
return h.tm_sec;
}
}
static inline int get_rtc_pll(struct rtc_pll_info *pll)
{
if (mach_get_rtc_pll)
return mach_get_rtc_pll(pll);
else
return -EINVAL;
}
static inline int set_rtc_pll(struct rtc_pll_info *pll)
{
if (mach_set_rtc_pll)
return mach_set_rtc_pll(pll);
else
return -EINVAL;
}
#endif /* __KERNEL__ */
#endif /* _ASM__RTC_H */
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
* Miscellaneous linux stuff * Miscellaneous linux stuff
*/ */
#include <linux/errno.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/mm.h> #include <linux/mm.h>
...@@ -25,6 +26,7 @@ ...@@ -25,6 +26,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/adb.h> #include <linux/adb.h>
#include <linux/cuda.h> #include <linux/cuda.h>
#include <linux/rtc.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
...@@ -34,7 +36,6 @@ ...@@ -34,7 +36,6 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/rtc.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/macintosh.h> #include <asm/macintosh.h>
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/rtc.h>
#include <asm/segment.h> #include <asm/segment.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/macintosh.h> #include <asm/macintosh.h>
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/traps.h> #include <asm/traps.h>
#include <asm/rtc.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/mvme147hw.h> #include <asm/mvme147hw.h>
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/traps.h> #include <asm/traps.h>
#include <asm/rtc.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/mvme16xhw.h> #include <asm/mvme16xhw.h>
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
* for more details. * for more details.
*/ */
#include <linux/errno.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mm.h> #include <linux/mm.h>
...@@ -27,7 +28,6 @@ ...@@ -27,7 +28,6 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/rtc.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/setup.h> #include <asm/setup.h>
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <asm/sun3-head.h> #include <asm/sun3-head.h>
#include <asm/sun3mmu.h> #include <asm/sun3mmu.h>
#include <asm/rtc.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/machines.h> #include <asm/machines.h>
#include <asm/idprom.h> #include <asm/idprom.h>
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
#include <linux/rtc.h> #include <linux/rtc.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/rtc.h>
#include <asm/intersil.h> #include <asm/intersil.h>
#include <asm/machdep.h>
/* bits to set for start/run of the intersil */ /* bits to set for start/run of the intersil */
......
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/machdep.h>
#include <asm/traps.h> #include <asm/traps.h>
#include <asm/sun3x.h> #include <asm/sun3x.h>
#include <asm/sun3ints.h> #include <asm/sun3ints.h>
#include <asm/rtc.h>
#include "time.h" #include "time.h"
......
...@@ -328,7 +328,7 @@ config JS_RTC ...@@ -328,7 +328,7 @@ config JS_RTC
config GEN_RTC config GEN_RTC
tristate "Generic /dev/rtc emulation" tristate "Generic /dev/rtc emulation"
depends on RTC!=y depends on RTC!=y
depends on M68K || PPC depends on PPC
---help--- ---help---
If you say Y here and create a character special file /dev/rtc with If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you major number 10 and minor number 135 using mknod ("man mknod"), you
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment