Commit 463a8630 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Alexandre Belloni

char/genrtc: x86: remove remnants of asm/rtc.h

Commit 3195ef59 ("x86: Do full rtc synchronization with ntp") had
the side-effect of unconditionally enabling the RTC_LIB symbol on x86,
which in turn disables the selection of the CONFIG_RTC and
CONFIG_GEN_RTC drivers that contain a two older implementations of
the CONFIG_RTC_DRV_CMOS driver.

This removes x86 from the list for genrtc, and changes all references
to the asm/rtc.h header to instead point to the interfaces
from linux/mc146818rtc.h.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent 5ab788d7
#include <asm-generic/rtc.h>
...@@ -1020,7 +1020,6 @@ void hpet_disable(void) ...@@ -1020,7 +1020,6 @@ void hpet_disable(void)
*/ */
#include <linux/mc146818rtc.h> #include <linux/mc146818rtc.h>
#include <linux/rtc.h> #include <linux/rtc.h>
#include <asm/rtc.h>
#define DEFAULT_RTC_INT_FREQ 64 #define DEFAULT_RTC_INT_FREQ 64
#define DEFAULT_RTC_SHIFT 6 #define DEFAULT_RTC_SHIFT 6
...@@ -1244,7 +1243,7 @@ irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id) ...@@ -1244,7 +1243,7 @@ irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id)
memset(&curr_time, 0, sizeof(struct rtc_time)); memset(&curr_time, 0, sizeof(struct rtc_time));
if (hpet_rtc_flags & (RTC_UIE | RTC_AIE)) if (hpet_rtc_flags & (RTC_UIE | RTC_AIE))
get_rtc_time(&curr_time); mc146818_set_time(&curr_time);
if (hpet_rtc_flags & RTC_UIE && if (hpet_rtc_flags & RTC_UIE &&
curr_time.tm_sec != hpet_prev_update_sec) { curr_time.tm_sec != hpet_prev_update_sec) {
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#include <asm/x86_init.h> #include <asm/x86_init.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/intel-mid.h> #include <asm/intel-mid.h>
#include <asm/rtc.h>
#include <asm/setup.h> #include <asm/setup.h>
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
...@@ -47,7 +46,7 @@ int mach_set_rtc_mmss(const struct timespec *now) ...@@ -47,7 +46,7 @@ int mach_set_rtc_mmss(const struct timespec *now)
rtc_time_to_tm(nowtime, &tm); rtc_time_to_tm(nowtime, &tm);
if (!rtc_valid_tm(&tm)) { if (!rtc_valid_tm(&tm)) {
retval = set_rtc_time(&tm); retval = mc146818_set_time(&tm);
if (retval) if (retval)
printk(KERN_ERR "%s: RTC write failed with error %d\n", printk(KERN_ERR "%s: RTC write failed with error %d\n",
__func__, retval); __func__, retval);
......
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include <asm/x86_init.h> #include <asm/x86_init.h>
#include <asm/rtc.h>
#include <asm/uv/uv.h> #include <asm/uv/uv.h>
static struct efi efi_phys __initdata; static struct efi efi_phys __initdata;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <asm-generic/rtc.h> #include <linux/mc146818rtc.h>
#include "internal.h" #include "internal.h"
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <linux/export.h> #include <linux/export.h>
#include <linux/rtc.h> #include <linux/rtc.h>
#include <asm/rtc.h> #include <linux/mc146818rtc.h>
#include "power.h" #include "power.h"
...@@ -103,7 +103,7 @@ static int set_magic_time(unsigned int user, unsigned int file, unsigned int dev ...@@ -103,7 +103,7 @@ static int set_magic_time(unsigned int user, unsigned int file, unsigned int dev
n /= 24; n /= 24;
time.tm_min = (n % 20) * 3; time.tm_min = (n % 20) * 3;
n /= 20; n /= 20;
set_rtc_time(&time); mc146818_set_time(&time);
return n ? -1 : 0; return n ? -1 : 0;
} }
...@@ -112,7 +112,7 @@ static unsigned int read_magic_time(void) ...@@ -112,7 +112,7 @@ static unsigned int read_magic_time(void)
struct rtc_time time; struct rtc_time time;
unsigned int val; unsigned int val;
get_rtc_time(&time); mc146818_get_time(&time);
pr_info("RTC time: %2d:%02d:%02d, date: %02d/%02d/%02d\n", pr_info("RTC time: %2d:%02d:%02d, date: %02d/%02d/%02d\n",
time.tm_hour, time.tm_min, time.tm_sec, time.tm_hour, time.tm_min, time.tm_sec,
time.tm_mon + 1, time.tm_mday, time.tm_year % 100); time.tm_mon + 1, time.tm_mday, time.tm_year % 100);
......
...@@ -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 ALPHA || M68K || MN10300 || PARISC || PPC || X86 depends on ALPHA || M68K || MN10300 || 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
......
...@@ -32,11 +32,11 @@ ...@@ -32,11 +32,11 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mc146818rtc.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/sfi.h> #include <linux/sfi.h>
#include <asm-generic/rtc.h>
#include <asm/intel_scu_ipc.h> #include <asm/intel_scu_ipc.h>
#include <asm/intel-mid.h> #include <asm/intel-mid.h>
#include <asm/intel_mid_vrtc.h> #include <asm/intel_mid_vrtc.h>
......
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