aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/rtc
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-06-01 10:46:22 -0400
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2016-06-25 19:20:08 -0400
commit5ee98ab3a8ea94fe24e288dc02c6b489889cf06a (patch)
tree659aeb864b015fe061cafd8920b33b309c3e75c5 /drivers/rtc
parentc361db5c2c64f1b7ffed5e9cc42e5062432238f2 (diff)
mn10300: use RTC_DRV_CMOS instead of CONFIG_RTC
nn10300 has a dependency on mc146818_get_time/mc146818_set_time, which we want to move from the mc146818rtc.h header into the rtc subsystem, which in turn is not usable on mn10300. This changes mn10300 to use the modern rtc-cmos driver instead of the old RTC driver, and that in turn lets us completely remove the read_persistent_clock/update_persistent_clock callbacks. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/Kconfig2
-rw-r--r--drivers/rtc/rtc-cmos.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 9f8b59d94b1d..13128a89657b 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -807,7 +807,7 @@ comment "Platform RTC drivers"
807 807
808config RTC_DRV_CMOS 808config RTC_DRV_CMOS
809 tristate "PC-style 'CMOS'" 809 tristate "PC-style 'CMOS'"
810 depends on X86 || ARM || M32R || PPC || MIPS || SPARC64 810 depends on X86 || ARM || M32R || PPC || MIPS || SPARC64 || MN10300
811 default y if X86 811 default y if X86
812 help 812 help
813 Say "yes" here to get direct support for the real time clock 813 Say "yes" here to get direct support for the real time clock
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index cf8eb98382ce..f9fdb6fc641c 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -630,7 +630,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
630 address_space = 64; 630 address_space = 64;
631#elif defined(__i386__) || defined(__x86_64__) || defined(__arm__) \ 631#elif defined(__i386__) || defined(__x86_64__) || defined(__arm__) \
632 || defined(__sparc__) || defined(__mips__) \ 632 || defined(__sparc__) || defined(__mips__) \
633 || defined(__powerpc__) 633 || defined(__powerpc__) || defined(CONFIG_MN10300)
634 address_space = 128; 634 address_space = 128;
635#else 635#else
636#warning Assuming 128 bytes of RTC+NVRAM address space, not 64 bytes. 636#warning Assuming 128 bytes of RTC+NVRAM address space, not 64 bytes.