[PATCH] rtc: ds1337: Remove various legacy code and update dependencies
Tom Rini
trini at konsulko.com
Fri Mar 20 21:53:32 CET 2026
At this point there are no users of this driver which do not enable
DM_RTC, so remove the legacy code and express the depdendency in
Kconfig. We can further remove code related to RTC chips / options that
are neither available in Kconfig nor set by any platforms.
Signed-off-by: Tom Rini <trini at konsulko.com>
---
drivers/rtc/Kconfig | 1 +
drivers/rtc/ds1337.c | 156 +------------------------------------------
2 files changed, 2 insertions(+), 155 deletions(-)
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index cb0a672668ea..648948cc735e 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -73,6 +73,7 @@ config RTC_DS1307
config RTC_DS1337
bool "Enable DS1337 driver"
+ depends on DM_RTC
help
Support for Dallas Semiconductor (now Maxim) DS1337/8/9 compatible
Real Time Clock devices.
diff --git a/drivers/rtc/ds1337.c b/drivers/rtc/ds1337.c
index 77544298d8a8..e9db6220c55d 100644
--- a/drivers/rtc/ds1337.c
+++ b/drivers/rtc/ds1337.c
@@ -21,7 +21,6 @@
/*
* RTC register addresses
*/
-#if defined CONFIG_RTC_DS1337
#define RTC_SEC_REG_ADDR 0x0
#define RTC_MIN_REG_ADDR 0x1
#define RTC_HR_REG_ADDR 0x2
@@ -32,18 +31,6 @@
#define RTC_CTL_REG_ADDR 0x0e
#define RTC_STAT_REG_ADDR 0x0f
#define RTC_TC_REG_ADDR 0x10
-#elif defined CONFIG_RTC_DS1388
-#define RTC_SEC_REG_ADDR 0x1
-#define RTC_MIN_REG_ADDR 0x2
-#define RTC_HR_REG_ADDR 0x3
-#define RTC_DAY_REG_ADDR 0x4
-#define RTC_DATE_REG_ADDR 0x5
-#define RTC_MON_REG_ADDR 0x6
-#define RTC_YR_REG_ADDR 0x7
-#define RTC_CTL_REG_ADDR 0x0c
-#define RTC_STAT_REG_ADDR 0x0b
-#define RTC_TC_REG_ADDR 0x0a
-#endif
/*
* RTC control register bits
@@ -62,132 +49,6 @@
#define RTC_STAT_BIT_A2F 0x2 /* Alarm 2 flag */
#define RTC_STAT_BIT_OSF 0x80 /* Oscillator stop flag */
-#if !CONFIG_IS_ENABLED(DM_RTC)
-static uchar rtc_read (uchar reg);
-static void rtc_write (uchar reg, uchar val);
-
-/*
- * Get the current time from the RTC
- */
-int rtc_get (struct rtc_time *tmp)
-{
- int rel = 0;
- uchar sec, min, hour, mday, wday, mon_cent, year, control, status;
-
- control = rtc_read (RTC_CTL_REG_ADDR);
- status = rtc_read (RTC_STAT_REG_ADDR);
- sec = rtc_read (RTC_SEC_REG_ADDR);
- min = rtc_read (RTC_MIN_REG_ADDR);
- hour = rtc_read (RTC_HR_REG_ADDR);
- wday = rtc_read (RTC_DAY_REG_ADDR);
- mday = rtc_read (RTC_DATE_REG_ADDR);
- mon_cent = rtc_read (RTC_MON_REG_ADDR);
- year = rtc_read (RTC_YR_REG_ADDR);
-
- /* No century bit, assume year 2000 */
-#ifdef CONFIG_RTC_DS1388
- mon_cent |= 0x80;
-#endif
-
- debug("Get RTC year: %02x mon/cent: %02x mday: %02x wday: %02x "
- "hr: %02x min: %02x sec: %02x control: %02x status: %02x\n",
- year, mon_cent, mday, wday, hour, min, sec, control, status);
-
- if (status & RTC_STAT_BIT_OSF) {
- printf ("### Warning: RTC oscillator has stopped\n");
- /* clear the OSF flag */
- rtc_write (RTC_STAT_REG_ADDR,
- rtc_read (RTC_STAT_REG_ADDR) & ~RTC_STAT_BIT_OSF);
- rel = -1;
- }
-
- tmp->tm_sec = bcd2bin (sec & 0x7F);
- tmp->tm_min = bcd2bin (min & 0x7F);
- tmp->tm_hour = bcd2bin (hour & 0x3F);
- tmp->tm_mday = bcd2bin (mday & 0x3F);
- tmp->tm_mon = bcd2bin (mon_cent & 0x1F);
- tmp->tm_year = bcd2bin (year) + ((mon_cent & 0x80) ? 2000 : 1900);
- tmp->tm_wday = bcd2bin ((wday - 1) & 0x07);
- tmp->tm_yday = 0;
- tmp->tm_isdst= 0;
-
- debug("Get DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n",
- tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
- tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
-
- return rel;
-}
-
-/*
- * Set the RTC
- */
-int rtc_set (struct rtc_time *tmp)
-{
- uchar century;
-
- debug("Set DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n",
- tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
- tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
-
- rtc_write (RTC_YR_REG_ADDR, bin2bcd (tmp->tm_year % 100));
-
- century = (tmp->tm_year >= 2000) ? 0x80 : 0;
- rtc_write (RTC_MON_REG_ADDR, bin2bcd (tmp->tm_mon) | century);
-
- rtc_write (RTC_DAY_REG_ADDR, bin2bcd (tmp->tm_wday + 1));
- rtc_write (RTC_DATE_REG_ADDR, bin2bcd (tmp->tm_mday));
- rtc_write (RTC_HR_REG_ADDR, bin2bcd (tmp->tm_hour));
- rtc_write (RTC_MIN_REG_ADDR, bin2bcd (tmp->tm_min));
- rtc_write (RTC_SEC_REG_ADDR, bin2bcd (tmp->tm_sec));
-
- return 0;
-}
-
-/*
- * Reset the RTC. We also enable the oscillator output on the
- * SQW/INTB* pin and program it for 32,768 Hz output. Note that
- * according to the datasheet, turning on the square wave output
- * increases the current drain on the backup battery from about
- * 600 nA to 2uA. Define CONFIG_RTC_DS1337_NOOSC if you wish to turn
- * off the OSC output.
- */
-
-#ifdef CONFIG_RTC_DS1337_NOOSC
- #define RTC_DS1337_RESET_VAL \
- (RTC_CTL_BIT_INTCN | RTC_CTL_BIT_RS1 | RTC_CTL_BIT_RS2)
-#else
- #define RTC_DS1337_RESET_VAL (RTC_CTL_BIT_RS1 | RTC_CTL_BIT_RS2)
-#endif
-void rtc_reset (void)
-{
-#ifdef CONFIG_RTC_DS1337
- rtc_write (RTC_CTL_REG_ADDR, RTC_DS1337_RESET_VAL);
-#elif defined CONFIG_RTC_DS1388
- rtc_write(RTC_CTL_REG_ADDR, 0x0); /* hw default */
-#endif
-#ifdef CONFIG_RTC_DS1339_TCR_VAL
- rtc_write (RTC_TC_REG_ADDR, CONFIG_RTC_DS1339_TCR_VAL);
-#endif
-#ifdef CONFIG_RTC_DS1388_TCR_VAL
- rtc_write(RTC_TC_REG_ADDR, CONFIG_RTC_DS1388_TCR_VAL);
-#endif
-}
-
-/*
- * Helper functions
- */
-
-static
-uchar rtc_read (uchar reg)
-{
- return (i2c_reg_read (CFG_SYS_I2C_RTC_ADDR, reg));
-}
-
-static void rtc_write (uchar reg, uchar val)
-{
- i2c_reg_write (CFG_SYS_I2C_RTC_ADDR, reg, val);
-}
-#else
static uchar rtc_read(struct udevice *dev, uchar reg)
{
return dm_i2c_reg_read(dev, reg);
@@ -213,11 +74,6 @@ static int ds1337_rtc_get(struct udevice *dev, struct rtc_time *tmp)
mon_cent = rtc_read(dev, RTC_MON_REG_ADDR);
year = rtc_read(dev, RTC_YR_REG_ADDR);
- /* No century bit, assume year 2000 */
-#ifdef CONFIG_RTC_DS1388
- mon_cent |= 0x80;
-#endif
-
debug("Get RTC year: %02x mon/cent: %02x mday: %02x wday: %02x\n",
year, mon_cent, mday, wday);
debug("hr: %02x min: %02x sec: %02x control: %02x status: %02x\n",
@@ -278,17 +134,8 @@ static int ds1337_rtc_set(struct udevice *dev, const struct rtc_time *tmp)
#endif
static int ds1337_rtc_reset(struct udevice *dev)
{
-#ifdef CONFIG_RTC_DS1337
rtc_write(dev, RTC_CTL_REG_ADDR, RTC_DS1337_RESET_VAL);
-#elif defined CONFIG_RTC_DS1388
- rtc_write(dev, RTC_CTL_REG_ADDR, 0x0); /* hw default */
-#endif
-#ifdef CONFIG_RTC_DS1339_TCR_VAL
- rtc_write(dev, RTC_TC_REG_ADDR, CONFIG_RTC_DS1339_TCR_VAL);
-#endif
-#ifdef CONFIG_RTC_DS1388_TCR_VAL
- rtc_write(dev, RTC_TC_REG_ADDR, CONFIG_RTC_DS1388_TCR_VAL);
-#endif
+
return 0;
}
@@ -311,4 +158,3 @@ U_BOOT_DRIVER(rtc_ds1337) = {
.of_match = ds1337_rtc_ids,
.ops = &ds1337_rtc_ops,
};
-#endif
--
2.43.0
More information about the U-Boot
mailing list