Commit 5ab788d7 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Alexandre Belloni
Browse files

rtc: cmos: move mc146818rtc code out of asm-generic/rtc.h 



Drivers should not really include stuff from asm-generic directly,
and the PC-style cmos rtc driver does this in order to reuse the
mc146818 implementation of get_rtc_time/set_rtc_time rather than
the architecture specific one for the architecture it gets built for.

To make it more obvious what is going on, this moves and renames the
two functions into include/linux/mc146818rtc.h, which holds the
other mc146818 specific code. Ideally it would be in a .c file,
but that would require extra infrastructure as the functions are
called by multiple drivers with conflicting dependencies.

With this change, the asm-generic/rtc.h header also becomes much
more generic, so it can be reused more easily across any architecture
that still relies on the genrtc driver.

The only caller of the internal __get_rtc_time/__set_rtc_time
functions is in arch/alpha/kernel/rtc.c, and we just change those
over to the new naming.

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 f09c5142

arch/alpha/kernel/rtc.c

+2 −4
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
#include <linux/rtc.h>

#include <linux/platform_device.h>



#include <asm/rtc.h>



#include "proto.h"
@@ -81,7 +79,7 @@ init_rtc_epoch(void) 
static int

alpha_rtc_read_time(struct device *dev, struct rtc_time *tm)

{

	__get_rtc_time(tm);

	mc146818_get_time(tm);



	/* Adjust for non-default epochs.  It's easier to depend on the

	   generic __get_rtc_time and adjust the epoch here than create
@@ -112,7 +110,7 @@ alpha_rtc_set_time(struct device *dev, struct rtc_time *tm) 
		tm = &xtm;

	}



	return __set_rtc_time(tm);

	return mc146818_set_time(tm);

}



static int

arch/x86/include/asm/mc146818rtc.h

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 


#include <asm/io.h>

#include <asm/processor.h>

#include <linux/mc146818rtc.h>



#ifndef RTC_PORT

#define RTC_PORT(x)	(0x70 + (x))

arch/x86/platform/efi/efi_64.c

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/bootmem.h>

#include <linux/ioport.h>

#include <linux/module.h>

#include <linux/mc146818rtc.h>

#include <linux/efi.h>

#include <linux/uaccess.h>

#include <linux/io.h>

arch/x86/platform/intel-mid/intel_mid_vrtc.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/init.h>

#include <linux/sfi.h>

#include <linux/platform_device.h>

#include <linux/mc146818rtc.h>



#include <asm/intel-mid.h>

#include <asm/intel_mid_vrtc.h>

drivers/rtc/rtc-cmos.c

+6 −6
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#include <linux/of_platform.h>



/* this is for "generic access to PC-style RTC" using CMOS_READ/CMOS_WRITE */

#include <asm-generic/rtc.h>

#include <linux/mc146818rtc.h>



struct cmos_rtc {

	struct rtc_device	*rtc;
@@ -190,10 +190,10 @@ static inline void cmos_write_bank2(unsigned char val, unsigned char addr) 
static int cmos_read_time(struct device *dev, struct rtc_time *t)

{

	/* REVISIT:  if the clock has a "century" register, use

	 * that instead of the heuristic in get_rtc_time().

	 * that instead of the heuristic in mc146818_get_time().

	 * That'll make Y3K compatility (year > 2070) easy!

	 */

	get_rtc_time(t);

	mc146818_get_time(t);

	return 0;

}
@@ -205,7 +205,7 @@ static int cmos_set_time(struct device *dev, struct rtc_time *t) 
	 * takes effect exactly 500ms after we write the register.

	 * (Also queueing and other delays before we get this far.)

	 */

	return set_rtc_time(t);

	return mc146818_set_time(t);

}



static int cmos_read_alarm(struct device *dev, struct rtc_wkalrm *t)
@@ -1142,14 +1142,14 @@ static __init void cmos_of_init(struct platform_device *pdev) 
	if (val)

		CMOS_WRITE(be32_to_cpup(val), RTC_FREQ_SELECT);



	get_rtc_time(&time);

	cmos_read_time(&pdev->dev, &time);

	ret = rtc_valid_tm(&time);

	if (ret) {

		struct rtc_time def_time = {

			.tm_year = 1,

			.tm_mday = 1,

		};

		set_rtc_time(&def_time);

		cmos_set_time(&pdev->dev, &def_time);

	}

}

#else

CRA Git | Maintained and supported by SUSTech CRA and CCSE