Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/x86/include/asm/rtc.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include <asm-generic/rtc.h>

arch/x86/kernel/hpet.c

+1 −2
Original line number Diff line number Diff line
@@ -1020,7 +1020,6 @@ void hpet_disable(void) 
 */

#include <linux/mc146818rtc.h>

#include <linux/rtc.h>

#include <asm/rtc.h>



#define DEFAULT_RTC_INT_FREQ	64

#define DEFAULT_RTC_SHIFT	6
@@ -1244,7 +1243,7 @@ irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id) 
	memset(&curr_time, 0, sizeof(struct rtc_time));



	if (hpet_rtc_flags & (RTC_UIE | RTC_AIE))

		get_rtc_time(&curr_time);

		mc146818_set_time(&curr_time);



	if (hpet_rtc_flags & RTC_UIE &&

	    curr_time.tm_sec != hpet_prev_update_sec) {

arch/x86/kernel/rtc.c

+1 −2
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <asm/x86_init.h>

#include <asm/time.h>

#include <asm/intel-mid.h>

#include <asm/rtc.h>

#include <asm/setup.h>



#ifdef CONFIG_X86_32
@@ -47,7 +46,7 @@ int mach_set_rtc_mmss(const struct timespec *now) 


	rtc_time_to_tm(nowtime, &tm);

	if (!rtc_valid_tm(&tm)) {

		retval = set_rtc_time(&tm);

		retval = mc146818_set_time(&tm);

		if (retval)

			printk(KERN_ERR "%s: RTC write failed with error %d\n",

			       __func__, retval);

arch/x86/platform/efi/efi.c

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 
#include <asm/cacheflush.h>

#include <asm/tlbflush.h>

#include <asm/x86_init.h>

#include <asm/rtc.h>

#include <asm/uv/uv.h>



static struct efi efi_phys __initdata;

drivers/acpi/acpi_cmos_rtc.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <linux/err.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <asm-generic/rtc.h>

#include <linux/mc146818rtc.h>



#include "internal.h"