[MIPS] Don't use genrtc. (fdc1f938) · Commits · 戴 / test

arch/mips/configs/yosemite_defconfig

+0 −2

Original line number	Diff line number	Diff line
		@@ -592,8 +592,6 @@ CONFIG_LEGACY_PTY_COUNT=256
		# CONFIG_WATCHDOG is not set
		# CONFIG_HW_RANDOM is not set
		# CONFIG_RTC is not set
		CONFIG_GEN_RTC=y
		CONFIG_GEN_RTC_X=y
		# CONFIG_DTLK is not set
		# CONFIG_R3964 is not set
		# CONFIG_APPLICOM is not set

drivers/char/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -815,7 +815,7 @@ config SGI_IP27_RTC

		config GEN_RTC
		tristate "Generic /dev/rtc emulation"
		depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC && !FRV && !S390 && !SUPERH
		depends on RTC!=y && !IA64 && !ARM && !M32R && !MIPS && !SPARC && !FRV && !S390 && !SUPERH
		---help---
		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

include/asm-mips/rtc.h

deleted100644 → 0

+0 −73

Original line number	Diff line number	Diff line
		/*
		* include/asm-mips/rtc.h
		*
		* (Really an interface for drivers/char/genrtc.c)
		*
		* Copyright (C) 2004 MontaVista Software Inc.
		* Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
		*
		* Please read the COPYING file for all license details.
		*/

		#ifndef _MIPS_RTC_H
		#define _MIPS_RTC_H

		#ifdef __KERNEL__

		#include <linux/rtc.h>
		#include <asm/time.h>

		#define RTC_PIE 0x40 /* periodic interrupt enable */
		#define RTC_AIE 0x20 /* alarm interrupt enable */
		#define RTC_UIE 0x10 /* update-finished interrupt enable */

		/* some dummy definitions */
		#define RTC_BATT_BAD 0x100 /* battery bad */
		#define RTC_SQWE 0x08 /* enable square-wave output */
		#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
		#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
		#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */

		static inline unsigned int get_rtc_time(struct rtc_time *time)
		{
		unsigned long nowtime;

		nowtime = rtc_mips_get_time();
		to_tm(nowtime, time);
		time->tm_year -= 1900;

		return RTC_24H;
		}

		static inline int set_rtc_time(struct rtc_time *time)
		{
		unsigned long nowtime;
		int ret;

		nowtime = mktime(time->tm_year+1900, time->tm_mon+1,
		time->tm_mday, time->tm_hour, time->tm_min,
		time->tm_sec);
		ret = rtc_mips_set_time(nowtime);

		return ret;
		}

		static inline unsigned int get_rtc_ss(void)
		{
		struct rtc_time h;

		get_rtc_time(&h);
		return h.tm_sec;
		}

		static inline int get_rtc_pll(struct rtc_pll_info *pll)
		{
		return -EINVAL;
		}

		static inline int set_rtc_pll(struct rtc_pll_info *pll)
		{
		return -EINVAL;
		}
		#endif
		#endif

Admin message