leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

char/genrtc: remove mn10300 support

Browse Source 
The genrtc driver serves no purpose on mn10300 because it drives the
same hardware as the original rtc.c driver, and the newer rtc-generic.c
or rtc-cmos.c drivers on architectures that use the asm-generic/rtc.h
header.

I assume it was initially only added for completeness when the
mn10300 port was done, but the older rtc.c driver was always used
instead.

We can also stop include asm-generic/rtc.h now, because we
just call mc146818_set_time() directly.

It would be nice to change the architecture to use the rtc-cmos driver
next, and remove support for the old rtc driver as well.

[linux@roeck-us.net: Add missing include file to proc-init.c]
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
This commit is contained in:
Arnd Bergmann 2016-05-30 20:57:54 +02:00 committed by Alexandre Belloni
parent 1cb1e35327
commit 7ee942179f
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mn10300/include/asm/rtc.h
View File

@ -25,6 +25,4 @@ static inline void calibrate_clock(void)
#endif /* !CONFIG_MN10300_RTC */ #endif /* !CONFIG_MN10300_RTC */
#include <asm-generic/rtc.h>
#endif /* _ASM_RTC_H */ #endif /* _ASM_RTC_H */

2
arch/mn10300/kernel/rtc.c
View File

@ -27,7 +27,7 @@ void read_persistent_clock(struct timespec *ts)
{ {
struct rtc_time tm; struct rtc_time tm;
get_rtc_time(&tm); mc146818_set_time(&tm);
ts->tv_nsec = 0; ts->tv_nsec = 0;
ts->tv_sec = mktime(tm.tm_year, tm.tm_mon, tm.tm_mday, ts->tv_sec = mktime(tm.tm_year, tm.tm_mon, tm.tm_mday,

2
arch/mn10300/proc-mn103e010/proc-init.c
View File

@ -9,7 +9,9 @@
* 2 of the Licence, or (at your option) any later version. * 2 of the Licence, or (at your option) any later version.
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <asm/cacheflush.h>
#include <asm/fpu.h> #include <asm/fpu.h>
#include <asm/irq.h>
#include <asm/rtc.h> #include <asm/rtc.h>
#include <asm/busctl-regs.h> #include <asm/busctl-regs.h>

1
arch/mn10300/proc-mn2ws0050/proc-init.c
View File

@ -14,6 +14,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <asm/cacheflush.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/io.h> #include <asm/io.h>

2
drivers/char/Kconfig
View File

@ -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 || MN10300 || PARISC || PPC depends on M68K || PARISC || 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