rtc: remove CONFIG_CMD_DATE dependency

The EFI subsystem accesses the real time clock and is enabled by default.
So we should drop any CONFIG_CMD_DATE dependency from the real time clock
drivers.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Heinrich Schuchardt 2018-07-07 23:39:12 +02:00 committed by Alexander Graf
parent 62045b0eb4
commit 5d88902401
24 changed files with 0 additions and 89 deletions

View File

@ -27,8 +27,6 @@
#include <asm/arch/at91_rtt.h> #include <asm/arch/at91_rtt.h>
#include <asm/arch/at91_gpbr.h> #include <asm/arch/at91_gpbr.h>
#if defined(CONFIG_CMD_DATE)
int rtc_get (struct rtc_time *tmp) int rtc_get (struct rtc_time *tmp)
{ {
at91_rtt_t *rtt = (at91_rtt_t *) ATMEL_BASE_RTT; at91_rtt_t *rtt = (at91_rtt_t *) ATMEL_BASE_RTT;
@ -78,5 +76,3 @@ void rtc_reset (void)
while (readl(&rtt->vr) != 0) while (readl(&rtt->vr) != 0)
; ;
} }
#endif

View File

@ -9,7 +9,6 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/davinci_rtc.h> #include <asm/davinci_rtc.h>
#if defined(CONFIG_CMD_DATE)
int rtc_get(struct rtc_time *tmp) int rtc_get(struct rtc_time *tmp)
{ {
struct davinci_rtc *rtc = (struct davinci_rtc *)DAVINCI_RTC_BASE; struct davinci_rtc *rtc = (struct davinci_rtc *)DAVINCI_RTC_BASE;
@ -79,4 +78,3 @@ void rtc_reset(void)
/* run RTC counter */ /* run RTC counter */
writel(0x01, &rtc->ctrl); writel(0x01, &rtc->ctrl);
} }
#endif

View File

@ -9,8 +9,6 @@
#include <command.h> #include <command.h>
#include <rtc.h> #include <rtc.h>
#if defined(CONFIG_CMD_DATE)
/* GPP Pins */ /* GPP Pins */
#define DATA 0x200 #define DATA 0x200
#define SCLK 0x400 #define SCLK 0x400
@ -328,5 +326,3 @@ int rtc_set(struct rtc_time *tmp)
return 0; return 0;
} }
#endif

View File

@ -19,8 +19,6 @@
#include <rtc.h> #include <rtc.h>
#include <spi.h> #include <spi.h>
#if defined(CONFIG_CMD_DATE)
#define RTC_SECONDS 0x00 #define RTC_SECONDS 0x00
#define RTC_MINUTES 0x01 #define RTC_MINUTES 0x01
#define RTC_HOURS 0x02 #define RTC_HOURS 0x02
@ -437,5 +435,3 @@ static void rtc_write (unsigned char reg, unsigned char val)
} }
#endif /* end of code exclusion (see #ifdef CONFIG_SXNI855T above) */ #endif /* end of code exclusion (see #ifdef CONFIG_SXNI855T above) */
#endif

View File

@ -51,8 +51,6 @@ enum ds_type {
#ifndef CONFIG_DM_RTC #ifndef CONFIG_DM_RTC
#if defined(CONFIG_CMD_DATE)
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
#undef DEBUG_RTC #undef DEBUG_RTC
@ -204,8 +202,6 @@ static void rtc_write (uchar reg, uchar val)
i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val); i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val);
} }
#endif /* CONFIG_CMD_DATE*/
#endif /* !CONFIG_DM_RTC */ #endif /* !CONFIG_DM_RTC */
#ifdef CONFIG_DM_RTC #ifdef CONFIG_DM_RTC

View File

@ -15,8 +15,6 @@
#include <rtc.h> #include <rtc.h>
#include <i2c.h> #include <i2c.h>
#if defined(CONFIG_CMD_DATE)
/* /*
* RTC register addresses * RTC register addresses
*/ */
@ -190,5 +188,3 @@ static void rtc_write (uchar reg, uchar val)
{ {
i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val); i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val);
} }
#endif

View File

@ -18,8 +18,6 @@
#include <rtc.h> #include <rtc.h>
#include <i2c.h> #include <i2c.h>
#if defined(CONFIG_CMD_DATE)
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
#undef DEBUG_RTC #undef DEBUG_RTC
#define DEBUG_RTC #define DEBUG_RTC
@ -214,4 +212,3 @@ static void rtc_write_raw (uchar reg, uchar val)
{ {
i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val); i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val);
} }
#endif

View File

@ -20,8 +20,6 @@
#include <rtc.h> #include <rtc.h>
#if defined(CONFIG_CMD_DATE)
static uchar rtc_read(unsigned int addr ); static uchar rtc_read(unsigned int addr );
static void rtc_write(unsigned int addr, uchar val); static void rtc_write(unsigned int addr, uchar val);
@ -171,5 +169,3 @@ static void rtc_write( unsigned int addr, uchar val )
#endif #endif
*(volatile unsigned char*)(addr) = val; *(volatile unsigned char*)(addr) = val;
} }
#endif

View File

@ -16,8 +16,6 @@
#include <command.h> #include <command.h>
#include <rtc.h> #include <rtc.h>
#if defined(CONFIG_CMD_DATE)
static uchar rtc_read( unsigned int addr ); static uchar rtc_read( unsigned int addr );
static void rtc_write( unsigned int addr, uchar val); static void rtc_write( unsigned int addr, uchar val);
@ -172,5 +170,3 @@ static void rtc_write( unsigned int addr, uchar val )
#endif #endif
out8( addr, val ); out8( addr, val );
} }
#endif

View File

@ -16,8 +16,6 @@
#include <rtc.h> #include <rtc.h>
#include <i2c.h> #include <i2c.h>
#if defined(CONFIG_CMD_DATE)
/* /*
* RTC register addresses * RTC register addresses
*/ */
@ -166,5 +164,3 @@ static void rtc_write (uchar reg, uchar val)
{ {
i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val); i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val);
} }
#endif

View File

@ -17,8 +17,6 @@
#include <linux/compat.h> #include <linux/compat.h>
#include <rtc.h> #include <rtc.h>
#if defined(CONFIG_CMD_DATE)
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
@ -222,5 +220,3 @@ void rtc_reset(void)
{ {
di_init(); di_init();
} }
#endif

View File

@ -29,8 +29,6 @@
#endif #endif
*/ */
#if defined(CONFIG_SYS_I2C_RTC_ADDR) && defined(CONFIG_CMD_DATE)
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
/* /*
these are simple defines for the chip local to here so they aren't too these are simple defines for the chip local to here so they aren't too
@ -167,4 +165,3 @@ void rtc_reset (void)
val = val & 0x3F;/*turn off freq test keep calibration*/ val = val & 0x3F;/*turn off freq test keep calibration*/
i2c_write(CONFIG_SYS_I2C_RTC_ADDR, RTC_CONTROL_ADDR, 1, &val, 1); i2c_write(CONFIG_SYS_I2C_RTC_ADDR, RTC_CONTROL_ADDR, 1, &val, 1);
} }
#endif

View File

@ -20,8 +20,6 @@
#include <rtc.h> #include <rtc.h>
#include <i2c.h> #include <i2c.h>
#if defined(CONFIG_SYS_I2C_RTC_ADDR) && defined(CONFIG_CMD_DATE)
/* /*
* Convert between century and "century bits" (CB1 and CB0). These routines * Convert between century and "century bits" (CB1 and CB0). These routines
* assume years are in the range 1900 - 2299. * assume years are in the range 1900 - 2299.
@ -237,4 +235,3 @@ void rtc_reset(void)
} }
rtc_dump("end reset"); rtc_dump("end reset");
} }
#endif /* CONFIG_RTC_M41T60 && CONFIG_SYS_I2C_RTC_ADDR && CONFIG_CMD_DATE */

View File

@ -18,8 +18,6 @@
#include <rtc.h> #include <rtc.h>
#include <i2c.h> #include <i2c.h>
#if defined(CONFIG_CMD_DATE)
#define M41T62_REG_SSEC 0 #define M41T62_REG_SSEC 0
#define M41T62_REG_SEC 1 #define M41T62_REG_SEC 1
#define M41T62_REG_MIN 2 #define M41T62_REG_MIN 2
@ -130,5 +128,3 @@ void rtc_reset(void)
val &= ~M41T80_ALHOUR_HT; val &= ~M41T80_ALHOUR_HT;
i2c_write(CONFIG_SYS_I2C_RTC_ADDR, M41T62_REG_ALARM_HOUR, 1, &val, 1); i2c_write(CONFIG_SYS_I2C_RTC_ADDR, M41T62_REG_ALARM_HOUR, 1, &val, 1);
} }
#endif

View File

@ -16,8 +16,6 @@
#include <rtc.h> #include <rtc.h>
#include <config.h> #include <config.h>
#if defined(CONFIG_CMD_DATE)
static uchar rtc_read (uchar reg); static uchar rtc_read (uchar reg);
static void rtc_write (uchar reg, uchar val); static void rtc_write (uchar reg, uchar val);
@ -135,5 +133,3 @@ static void rtc_write (uchar reg, uchar val)
*(unsigned char *) *(unsigned char *)
((CONFIG_SYS_NVRAM_BASE_ADDR + CONFIG_SYS_NVRAM_SIZE - 8) + reg) = val; ((CONFIG_SYS_NVRAM_BASE_ADDR + CONFIG_SYS_NVRAM_SIZE - 8) + reg) = val;
} }
#endif

View File

@ -15,8 +15,6 @@
#include <rtc.h> #include <rtc.h>
#include <i2c.h> #include <i2c.h>
#if defined(CONFIG_CMD_DATE)
#ifndef CONFIG_SYS_I2C_RTC_ADDR #ifndef CONFIG_SYS_I2C_RTC_ADDR
#define CONFIG_SYS_I2C_RTC_ADDR 0x50 #define CONFIG_SYS_I2C_RTC_ADDR 0x50
#endif #endif
@ -104,5 +102,3 @@ int rtc_set (struct rtc_time *tmp)
void rtc_reset (void) void rtc_reset (void)
{ {
} }
#endif

View File

@ -19,8 +19,6 @@
#define out8(p, v) outb(v, p) #define out8(p, v) outb(v, p)
#endif #endif
#if defined(CONFIG_CMD_DATE)
/* Set this to 1 to clear the CMOS RAM */ /* Set this to 1 to clear the CMOS RAM */
#define CLEAR_CMOS 0 #define CLEAR_CMOS 0
@ -195,7 +193,6 @@ static void mc146818_init(void)
/* Clear any pending interrupts */ /* Clear any pending interrupts */
mc146818_read8(RTC_CONFIG_C); mc146818_read8(RTC_CONFIG_C);
} }
#endif /* CONFIG_CMD_DATE */
#ifdef CONFIG_DM_RTC #ifdef CONFIG_DM_RTC

View File

@ -6,8 +6,6 @@
#include <common.h> #include <common.h>
#if defined(CONFIG_CMD_DATE)
#include <command.h> #include <command.h>
#include <rtc.h> #include <rtc.h>
#include <asm/immap.h> #include <asm/immap.h>
@ -104,5 +102,3 @@ void rtc_reset(void)
rtc->cr |= RTC_CR_SWR; rtc->cr |= RTC_CR_SWR;
} }
#endif /* CONFIG_MCFRTC && CONFIG_CMD_DATE */

View File

@ -70,8 +70,6 @@ void nvram_write(short dest, const void *src, size_t count)
rtc_write(d++, *s++); rtc_write(d++, *s++);
} }
#if defined(CONFIG_CMD_DATE)
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
int rtc_get (struct rtc_time *tmp) int rtc_get (struct rtc_time *tmp)
@ -175,5 +173,3 @@ void rtc_set_watchdog(short multi, short res)
wd_value = RTC_WDS | ((multi & 0x1F) << 2) | (res & 0x3); wd_value = RTC_WDS | ((multi & 0x1F) << 2) | (res & 0x3);
rtc_write(RTC_WATCHDOG, wd_value); rtc_write(RTC_WATCHDOG, wd_value);
} }
#endif

View File

@ -15,8 +15,6 @@
#include <rtc.h> #include <rtc.h>
#include <i2c.h> #include <i2c.h>
#if defined(CONFIG_CMD_DATE)
static uchar rtc_read (uchar reg); static uchar rtc_read (uchar reg);
static void rtc_write (uchar reg, uchar val); static void rtc_write (uchar reg, uchar val);
@ -117,5 +115,3 @@ static void rtc_write (uchar reg, uchar val)
{ {
i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val); i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val);
} }
#endif

View File

@ -24,7 +24,6 @@
#include <rtc.h> #include <rtc.h>
#include <i2c.h> #include <i2c.h>
#if defined(CONFIG_CMD_DATE)
/* /*
* Reads are always done starting with register 15, which requires some * Reads are always done starting with register 15, which requires some
* jumping-through-hoops to access the data correctly. * jumping-through-hoops to access the data correctly.
@ -255,5 +254,3 @@ rtc_reset (void)
if (!setup_done) if (!setup_done)
rs5c372_enable(); rs5c372_enable();
} }
#endif

View File

@ -13,8 +13,6 @@
#include <rtc.h> #include <rtc.h>
#include <i2c.h> #include <i2c.h>
#if defined(CONFIG_CMD_DATE)
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
#undef DEBUG_RTC #undef DEBUG_RTC
@ -190,5 +188,3 @@ static void rtc_write (uchar reg, uchar val)
printf("Error writing to RTC\n"); printf("Error writing to RTC\n");
} }
#endif /* CONFIG_RTC_RX8025 && CONFIG_CMD_DATE */

View File

@ -11,8 +11,6 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#if (defined(CONFIG_CMD_DATE))
#include <asm/arch/s3c24x0_cpu.h> #include <asm/arch/s3c24x0_cpu.h>
#include <rtc.h> #include <rtc.h>
@ -149,5 +147,3 @@ void rtc_reset(void)
writeb((readb(&rtc->rtccon) & ~0x06) | 0x08, &rtc->rtccon); writeb((readb(&rtc->rtccon) & ~0x06) | 0x08, &rtc->rtccon);
writeb(readb(&rtc->rtccon) & ~(0x08 | 0x01), &rtc->rtccon); writeb(readb(&rtc->rtccon) & ~(0x08 | 0x01), &rtc->rtccon);
} }
#endif

View File

@ -22,8 +22,6 @@
#include <rtc.h> #include <rtc.h>
#include <i2c.h> #include <i2c.h>
#if defined(CONFIG_CMD_DATE)
#define CCR_SEC 0 #define CCR_SEC 0
#define CCR_MIN 1 #define CCR_MIN 1
#define CCR_HOUR 2 #define CCR_HOUR 2
@ -160,5 +158,3 @@ void rtc_reset(void)
* Nothing to do * Nothing to do
*/ */
} }
#endif