diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-05-30 14:57:59 -0400 |
---|---|---|
committer | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2016-06-03 18:23:28 -0400 |
commit | 084b3600e2d98ebbab968f91b8b8f48ffbbf2ecb (patch) | |
tree | 4833d3b0f041e321dca2f1d7f6fe82caade31095 | |
parent | 598e8a1fb5e123894686cce5500775c2ae8b57fc (diff) |
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: Arnd Bergmann <arnd@arndb.de>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
-rw-r--r-- | arch/m68k/amiga/config.c | 1 | ||||
-rw-r--r-- | arch/m68k/apollo/config.c | 1 | ||||
-rw-r--r-- | arch/m68k/bvme6000/config.c | 1 | ||||
-rw-r--r-- | arch/m68k/hp300/config.c | 2 | ||||
-rw-r--r-- | arch/m68k/include/asm/rtc.h | 79 | ||||
-rw-r--r-- | arch/m68k/mac/config.c | 3 | ||||
-rw-r--r-- | arch/m68k/mac/misc.c | 1 | ||||
-rw-r--r-- | arch/m68k/mvme147/config.c | 1 | ||||
-rw-r--r-- | arch/m68k/mvme16x/config.c | 1 | ||||
-rw-r--r-- | arch/m68k/q40/config.c | 2 | ||||
-rw-r--r-- | arch/m68k/sun3/config.c | 1 | ||||
-rw-r--r-- | arch/m68k/sun3/intersil.c | 2 | ||||
-rw-r--r-- | arch/m68k/sun3x/time.c | 2 | ||||
-rw-r--r-- | drivers/char/Kconfig | 2 |
14 files changed, 7 insertions, 92 deletions
diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c index 01693df7f2f6..ec9cc1fdd237 100644 --- a/arch/m68k/amiga/config.c +++ b/arch/m68k/amiga/config.c | |||
@@ -35,7 +35,6 @@ | |||
35 | #include <asm/amigahw.h> | 35 | #include <asm/amigahw.h> |
36 | #include <asm/amigaints.h> | 36 | #include <asm/amigaints.h> |
37 | #include <asm/irq.h> | 37 | #include <asm/irq.h> |
38 | #include <asm/rtc.h> | ||
39 | #include <asm/machdep.h> | 38 | #include <asm/machdep.h> |
40 | #include <asm/io.h> | 39 | #include <asm/io.h> |
41 | 40 | ||
diff --git a/arch/m68k/apollo/config.c b/arch/m68k/apollo/config.c index 6e62d66c396e..432bc8bacfc2 100644 --- a/arch/m68k/apollo/config.c +++ b/arch/m68k/apollo/config.c | |||
@@ -15,7 +15,6 @@ | |||
15 | #include <asm/pgtable.h> | 15 | #include <asm/pgtable.h> |
16 | #include <asm/apollohw.h> | 16 | #include <asm/apollohw.h> |
17 | #include <asm/irq.h> | 17 | #include <asm/irq.h> |
18 | #include <asm/rtc.h> | ||
19 | #include <asm/machdep.h> | 18 | #include <asm/machdep.h> |
20 | 19 | ||
21 | u_long sio01_physaddr; | 20 | u_long sio01_physaddr; |
diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c index 478623dbb209..611d4d9ea2bd 100644 --- a/arch/m68k/bvme6000/config.c +++ b/arch/m68k/bvme6000/config.c | |||
@@ -34,7 +34,6 @@ | |||
34 | #include <asm/setup.h> | 34 | #include <asm/setup.h> |
35 | #include <asm/irq.h> | 35 | #include <asm/irq.h> |
36 | #include <asm/traps.h> | 36 | #include <asm/traps.h> |
37 | #include <asm/rtc.h> | ||
38 | #include <asm/machdep.h> | 37 | #include <asm/machdep.h> |
39 | #include <asm/bvme6000hw.h> | 38 | #include <asm/bvme6000hw.h> |
40 | 39 | ||
diff --git a/arch/m68k/hp300/config.c b/arch/m68k/hp300/config.c index a9befe65adc4..7cfab158fb61 100644 --- a/arch/m68k/hp300/config.c +++ b/arch/m68k/hp300/config.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <linux/string.h> | 12 | #include <linux/string.h> |
13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
14 | #include <linux/console.h> | 14 | #include <linux/console.h> |
15 | #include <linux/rtc.h> | ||
15 | 16 | ||
16 | #include <asm/bootinfo.h> | 17 | #include <asm/bootinfo.h> |
17 | #include <asm/bootinfo-hp300.h> | 18 | #include <asm/bootinfo-hp300.h> |
@@ -20,7 +21,6 @@ | |||
20 | #include <asm/blinken.h> | 21 | #include <asm/blinken.h> |
21 | #include <asm/io.h> /* readb() and writeb() */ | 22 | #include <asm/io.h> /* readb() and writeb() */ |
22 | #include <asm/hp300hw.h> | 23 | #include <asm/hp300hw.h> |
23 | #include <asm/rtc.h> | ||
24 | 24 | ||
25 | #include "time.h" | 25 | #include "time.h" |
26 | 26 | ||
diff --git a/arch/m68k/include/asm/rtc.h b/arch/m68k/include/asm/rtc.h deleted file mode 100644 index a4d08ea122ee..000000000000 --- a/arch/m68k/include/asm/rtc.h +++ /dev/null | |||
@@ -1,79 +0,0 @@ | |||
1 | /* include/asm-m68k/rtc.h | ||
2 | * | ||
3 | * Copyright Richard Zidlicky | ||
4 | * implementation details for genrtc/q40rtc driver | ||
5 | */ | ||
6 | /* permission is hereby granted to copy, modify and redistribute this code | ||
7 | * in terms of the GNU Library General Public License, Version 2 or later, | ||
8 | * at your option. | ||
9 | */ | ||
10 | |||
11 | #ifndef _ASM_RTC_H | ||
12 | #define _ASM_RTC_H | ||
13 | |||
14 | #ifdef __KERNEL__ | ||
15 | |||
16 | #include <linux/rtc.h> | ||
17 | #include <asm/errno.h> | ||
18 | #include <asm/machdep.h> | ||
19 | |||
20 | #define RTC_PIE 0x40 /* periodic interrupt enable */ | ||
21 | #define RTC_AIE 0x20 /* alarm interrupt enable */ | ||
22 | #define RTC_UIE 0x10 /* update-finished interrupt enable */ | ||
23 | |||
24 | /* some dummy definitions */ | ||
25 | #define RTC_BATT_BAD 0x100 /* battery bad */ | ||
26 | #define RTC_SQWE 0x08 /* enable square-wave output */ | ||
27 | #define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */ | ||
28 | #define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */ | ||
29 | #define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */ | ||
30 | |||
31 | static inline unsigned int get_rtc_time(struct rtc_time *time) | ||
32 | { | ||
33 | /* | ||
34 | * Only the values that we read from the RTC are set. We leave | ||
35 | * tm_wday, tm_yday and tm_isdst untouched. Even though the | ||
36 | * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated | ||
37 | * by the RTC when initially set to a non-zero value. | ||
38 | */ | ||
39 | if (mach_hwclk) | ||
40 | mach_hwclk(0, time); | ||
41 | return RTC_24H; | ||
42 | } | ||
43 | |||
44 | static inline int set_rtc_time(struct rtc_time *time) | ||
45 | { | ||
46 | if (mach_hwclk) | ||
47 | return mach_hwclk(1, time); | ||
48 | return -EINVAL; | ||
49 | } | ||
50 | |||
51 | static inline unsigned int get_rtc_ss(void) | ||
52 | { | ||
53 | if (mach_get_ss) | ||
54 | return mach_get_ss(); | ||
55 | else{ | ||
56 | struct rtc_time h; | ||
57 | |||
58 | get_rtc_time(&h); | ||
59 | return h.tm_sec; | ||
60 | } | ||
61 | } | ||
62 | |||
63 | static inline int get_rtc_pll(struct rtc_pll_info *pll) | ||
64 | { | ||
65 | if (mach_get_rtc_pll) | ||
66 | return mach_get_rtc_pll(pll); | ||
67 | else | ||
68 | return -EINVAL; | ||
69 | } | ||
70 | static inline int set_rtc_pll(struct rtc_pll_info *pll) | ||
71 | { | ||
72 | if (mach_set_rtc_pll) | ||
73 | return mach_set_rtc_pll(pll); | ||
74 | else | ||
75 | return -EINVAL; | ||
76 | } | ||
77 | #endif /* __KERNEL__ */ | ||
78 | |||
79 | #endif /* _ASM__RTC_H */ | ||
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index 689b47d292ac..2f33a33001e5 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c | |||
@@ -10,6 +10,7 @@ | |||
10 | * Miscellaneous linux stuff | 10 | * Miscellaneous linux stuff |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <linux/errno.h> | ||
13 | #include <linux/module.h> | 14 | #include <linux/module.h> |
14 | #include <linux/types.h> | 15 | #include <linux/types.h> |
15 | #include <linux/mm.h> | 16 | #include <linux/mm.h> |
@@ -25,6 +26,7 @@ | |||
25 | #include <linux/platform_device.h> | 26 | #include <linux/platform_device.h> |
26 | #include <linux/adb.h> | 27 | #include <linux/adb.h> |
27 | #include <linux/cuda.h> | 28 | #include <linux/cuda.h> |
29 | #include <linux/rtc.h> | ||
28 | 30 | ||
29 | #include <asm/setup.h> | 31 | #include <asm/setup.h> |
30 | #include <asm/bootinfo.h> | 32 | #include <asm/bootinfo.h> |
@@ -34,7 +36,6 @@ | |||
34 | #include <asm/io.h> | 36 | #include <asm/io.h> |
35 | #include <asm/irq.h> | 37 | #include <asm/irq.h> |
36 | #include <asm/pgtable.h> | 38 | #include <asm/pgtable.h> |
37 | #include <asm/rtc.h> | ||
38 | #include <asm/machdep.h> | 39 | #include <asm/machdep.h> |
39 | 40 | ||
40 | #include <asm/macintosh.h> | 41 | #include <asm/macintosh.h> |
diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c index 707b61aea203..0fb54a90eac2 100644 --- a/arch/m68k/mac/misc.c +++ b/arch/m68k/mac/misc.c | |||
@@ -18,7 +18,6 @@ | |||
18 | 18 | ||
19 | #include <asm/uaccess.h> | 19 | #include <asm/uaccess.h> |
20 | #include <asm/io.h> | 20 | #include <asm/io.h> |
21 | #include <asm/rtc.h> | ||
22 | #include <asm/segment.h> | 21 | #include <asm/segment.h> |
23 | #include <asm/setup.h> | 22 | #include <asm/setup.h> |
24 | #include <asm/macintosh.h> | 23 | #include <asm/macintosh.h> |
diff --git a/arch/m68k/mvme147/config.c b/arch/m68k/mvme147/config.c index e6a3b56c6481..c11d38dfad08 100644 --- a/arch/m68k/mvme147/config.c +++ b/arch/m68k/mvme147/config.c | |||
@@ -32,7 +32,6 @@ | |||
32 | #include <asm/setup.h> | 32 | #include <asm/setup.h> |
33 | #include <asm/irq.h> | 33 | #include <asm/irq.h> |
34 | #include <asm/traps.h> | 34 | #include <asm/traps.h> |
35 | #include <asm/rtc.h> | ||
36 | #include <asm/machdep.h> | 35 | #include <asm/machdep.h> |
37 | #include <asm/mvme147hw.h> | 36 | #include <asm/mvme147hw.h> |
38 | 37 | ||
diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c index a53803cc66cd..58e240939d26 100644 --- a/arch/m68k/mvme16x/config.c +++ b/arch/m68k/mvme16x/config.c | |||
@@ -35,7 +35,6 @@ | |||
35 | #include <asm/setup.h> | 35 | #include <asm/setup.h> |
36 | #include <asm/irq.h> | 36 | #include <asm/irq.h> |
37 | #include <asm/traps.h> | 37 | #include <asm/traps.h> |
38 | #include <asm/rtc.h> | ||
39 | #include <asm/machdep.h> | 38 | #include <asm/machdep.h> |
40 | #include <asm/mvme16xhw.h> | 39 | #include <asm/mvme16xhw.h> |
41 | 40 | ||
diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c index e90fe903613e..fcb7f05b60b6 100644 --- a/arch/m68k/q40/config.c +++ b/arch/m68k/q40/config.c | |||
@@ -12,6 +12,7 @@ | |||
12 | * for more details. | 12 | * for more details. |
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include <linux/errno.h> | ||
15 | #include <linux/types.h> | 16 | #include <linux/types.h> |
16 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
17 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
@@ -27,7 +28,6 @@ | |||
27 | #include <linux/platform_device.h> | 28 | #include <linux/platform_device.h> |
28 | 29 | ||
29 | #include <asm/io.h> | 30 | #include <asm/io.h> |
30 | #include <asm/rtc.h> | ||
31 | #include <asm/bootinfo.h> | 31 | #include <asm/bootinfo.h> |
32 | #include <asm/pgtable.h> | 32 | #include <asm/pgtable.h> |
33 | #include <asm/setup.h> | 33 | #include <asm/setup.h> |
diff --git a/arch/m68k/sun3/config.c b/arch/m68k/sun3/config.c index 71884bf01d72..3af34fa3a344 100644 --- a/arch/m68k/sun3/config.c +++ b/arch/m68k/sun3/config.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <asm/pgalloc.h> | 26 | #include <asm/pgalloc.h> |
27 | #include <asm/sun3-head.h> | 27 | #include <asm/sun3-head.h> |
28 | #include <asm/sun3mmu.h> | 28 | #include <asm/sun3mmu.h> |
29 | #include <asm/rtc.h> | ||
30 | #include <asm/machdep.h> | 29 | #include <asm/machdep.h> |
31 | #include <asm/machines.h> | 30 | #include <asm/machines.h> |
32 | #include <asm/idprom.h> | 31 | #include <asm/idprom.h> |
diff --git a/arch/m68k/sun3/intersil.c b/arch/m68k/sun3/intersil.c index 889829e11f1d..2cd0bcbe6f30 100644 --- a/arch/m68k/sun3/intersil.c +++ b/arch/m68k/sun3/intersil.c | |||
@@ -14,8 +14,8 @@ | |||
14 | #include <linux/rtc.h> | 14 | #include <linux/rtc.h> |
15 | 15 | ||
16 | #include <asm/errno.h> | 16 | #include <asm/errno.h> |
17 | #include <asm/rtc.h> | ||
18 | #include <asm/intersil.h> | 17 | #include <asm/intersil.h> |
18 | #include <asm/machdep.h> | ||
19 | 19 | ||
20 | 20 | ||
21 | /* bits to set for start/run of the intersil */ | 21 | /* bits to set for start/run of the intersil */ |
diff --git a/arch/m68k/sun3x/time.c b/arch/m68k/sun3x/time.c index c8eb08add6b0..431d3c4306dd 100644 --- a/arch/m68k/sun3x/time.c +++ b/arch/m68k/sun3x/time.c | |||
@@ -15,10 +15,10 @@ | |||
15 | 15 | ||
16 | #include <asm/irq.h> | 16 | #include <asm/irq.h> |
17 | #include <asm/io.h> | 17 | #include <asm/io.h> |
18 | #include <asm/machdep.h> | ||
18 | #include <asm/traps.h> | 19 | #include <asm/traps.h> |
19 | #include <asm/sun3x.h> | 20 | #include <asm/sun3x.h> |
20 | #include <asm/sun3ints.h> | 21 | #include <asm/sun3ints.h> |
21 | #include <asm/rtc.h> | ||
22 | 22 | ||
23 | #include "time.h" | 23 | #include "time.h" |
24 | 24 | ||
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 074bc394e31b..fccac76257c9 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig | |||
@@ -328,7 +328,7 @@ config JS_RTC | |||
328 | config GEN_RTC | 328 | config GEN_RTC |
329 | tristate "Generic /dev/rtc emulation" | 329 | tristate "Generic /dev/rtc emulation" |
330 | depends on RTC!=y | 330 | depends on RTC!=y |
331 | depends on M68K || PPC | 331 | depends on PPC |
332 | ---help--- | 332 | ---help--- |
333 | If you say Y here and create a character special file /dev/rtc with | 333 | If you say Y here and create a character special file /dev/rtc with |
334 | major number 10 and minor number 135 using mknod ("man mknod"), you | 334 | major number 10 and minor number 135 using mknod ("man mknod"), you |