rtc: ds1307: Remove legacy non-DM code
PATCH 1/1 rtc: ds1307: Remove legacy non-DM code
From: Francesco Dolcini <[email protected]>
The DS1307 driver depends on DM_RTC since commit d425d6056e01 ("rtc: Add DM support to ds1307"), remove the related obsolete code.
Signed-off-by Francesco Dolcini <[email protected]>
--- drivers/rtc/ds1307.c | 152 ------------------------------------------- 1 file changed, 152 deletions(-)
drivers/rtc/ds1307.c +0 -152
@@ -68,157 +68,6 @@ enum ds_type {#define MCP7941X_BIT_ST 0x80#define MCP7941X_BIT_VBATEN 0x08 -#ifndef CONFIG_DM_RTC - -/*---------------------------------------------------------------------*/ -#undef DEBUG_RTC - -#ifdef DEBUG_RTC -#define DEBUGR(fmt, args...) printf(fmt, ##args) -#else -#define DEBUGR(fmt, args...) -#endif -/*---------------------------------------------------------------------*/ - -#ifndef CFG_SYS_I2C_RTC_ADDR -# define CFG_SYS_I2C_RTC_ADDR 0x68 -#endif - -#if defined(CONFIG_RTC_DS1307 ) && (CONFIG_SYS_I2C_SPEED >100000 ) -# error The DS1307 is specified only up to 100kHz! -#endif - -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, year; - -#ifdef CONFIG_RTC_MCP79411 -read_rtc: -#endif - 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 =rtc_read (RTC_MON_REG_ADDR ); - year =rtc_read (RTC_YR_REG_ADDR ); - -DEBUGR ("Get RTC year: %02x mon: %02x mday: %02x wday: %02x " -"hr: %02x min: %02x sec: %02x\n" , - year, mon, mday, wday, hour, min, sec); - -#ifdef CONFIG_RTC_DS1307 -if (sec &RTC_SEC_BIT_CH ) { -printf ("### Warning: RTC oscillator has stopped\n" ); -/* clear the CH flag */ -rtc_write (RTC_SEC_REG_ADDR , -rtc_read (RTC_SEC_REG_ADDR ) & ~RTC_SEC_BIT_CH ); - rel =-1 ; - } -#endif - -#ifdef CONFIG_RTC_MCP79411 -/* make sure that the backup battery is enabled */ -if (!(wday &MCP7941X_BIT_VBATEN )) { -rtc_write (RTC_DAY_REG_ADDR , - wday |MCP7941X_BIT_VBATEN ); - } - -/* clock halted? turn it on, so clock can tick. */ -if (!(sec &MCP7941X_BIT_ST )) { -rtc_write (RTC_SEC_REG_ADDR ,MCP7941X_BIT_ST ); -printf ("Started RTC\n" ); - goto read_rtc; - } -#endif - - 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 &0x1F ); - tmp->tm_year =bcd2bin (year) + (bcd2bin (year) >=70 ?1900 :2000 ); - tmp->tm_wday =bcd2bin ((wday -1 ) &0x07 ); - tmp->tm_yday =0 ; - tmp->tm_isdst=0 ; - -DEBUGR ("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) -{ -DEBUGR ("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); - -if (tmp->tm_year <1970 || tmp->tm_year >2069 ) -printf ("WARNING: year should be between 1970 and 2069!\n" ); - -rtc_write (RTC_YR_REG_ADDR ,bin2bcd (tmp->tm_year %100 )); -rtc_write (RTC_MON_REG_ADDR ,bin2bcd (tmp->tm_mon)); -#ifdef CONFIG_RTC_MCP79411 -rtc_write (RTC_DAY_REG_ADDR , -bin2bcd (tmp->tm_wday +1 ) |MCP7941X_BIT_VBATEN ); -#else -rtc_write (RTC_DAY_REG_ADDR ,bin2bcd (tmp->tm_wday +1 )); -#endif -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)); -#ifdef CONFIG_RTC_MCP79411 -rtc_write (RTC_SEC_REG_ADDR ,bin2bcd (tmp->tm_sec) |MCP7941X_BIT_ST ); -#else -rtc_write (RTC_SEC_REG_ADDR ,bin2bcd (tmp->tm_sec)); -#endif - -return 0 ; -} - -/* -* Reset the RTC. We setting the date back to 1970-01-01. -* We also enable the oscillator output on the SQW/OUT 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 to something between 480nA and 800nA. -*/ -void rtc_reset (void ) -{ -rtc_write (RTC_SEC_REG_ADDR ,0x00 );/* clearing Clock Halt */ -rtc_write (RTC_CTL_REG_ADDR ,RTC_CTL_BIT_SQWE |RTC_CTL_BIT_RS1 |RTC_CTL_BIT_RS0 ); -} - -/* -* 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); -} - -#endif /* !CONFIG_DM_RTC */ - -#ifdef CONFIG_DM_RTC static int ds1307_rtc_set (struct udevice *dev,const struct rtc_time *tm) {int ret;
@@ -366,4 +215,3 @@ U_BOOT_DRIVER(rtc_ds1307) = { .of_match = ds1307_rtc_ids, .ops = &ds1307_rtc_ops, }; -#endif /* CONFIG_DM_RTC */
Signature · 1 line
2.47.3
Quoted 9 lines · Francesco Dolcini
rtc: ds1307: Remove legacy non-DM code
The DS1307 driver depends on
DM_RTCsince commitd425d6056e01("rtc: Add DM support to ds1307"), remove the related obsolete code.Signed-off-by Francesco Dolcini <[email protected]>
drivers/rtc/ds1307.c| 152 ---------------------------------------------------1 file changed, 152 deletions(-)
Reviewed-by Simon Glass <[email protected]>
Quoted 4 lines · Francesco Dolcini
The DS1307 driver depends on
DM_RTCsince commitd425d6056e01("rtc: Add DM support to ds1307"), remove the related obsolete code.
Applied to u-boot/master, thanks!
[1/1] rtc: ds1307: Remove legacy non-DM code
commit: b5633dddbd9d3d17e36e4129cd37b05beedc325a
Signature · 1 line
Tom