rtc, dm: add DM/Kconfig support for RTC_RX8025 driver
cover rtc, dm: add DM/Kconfig support for RTC_RX8025 driver
add DM and Kconfig support for RTC_RX8025 driver.
Based on mainline commit:6070ef409c - Merge branch '2019-07-12-master-imports'
Travis build:
https://travis-ci.org/hsdenx/u-boot-test/builds/558787565
Heiko Schocher (3):
rtc: move RTC_RX8025 to Kconfig
rtc, rx8025: fix Coding Style
rtc, rx8025: add DM support
configs/caddy2_defconfig | 1 + configs/socrates_defconfig | 1 + configs/vme8349_defconfig | 1 + drivers/rtc/Kconfig | 5 + drivers/rtc/rx8025.c | 180 ++++++++++++++++++++++++++++------- include/configs/caddy2.h | 1 - include/configs/socrates.h | 1 - include/configs/vme8349.h | 1 - scripts/config_whitelist.txt | 1 - 9 files changed, 156 insertions(+), 36 deletions(-)
Signature · 1 line
2.21.0
PATCH 1/3 rtc: move RTC_RX8025 to Kconfig
move RTC_RX8025 to Kconfig and fixup board configs.
---
configs/caddy2_defconfig | 1 + configs/socrates_defconfig | 1 + configs/vme8349_defconfig | 1 + drivers/rtc/Kconfig | 5 +++++ include/configs/caddy2.h | 1 - include/configs/socrates.h | 1 - include/configs/vme8349.h | 1 - scripts/config_whitelist.txt | 1 - 8 files changed, 8 insertions(+), 4 deletions(-)
configs/caddy2_defconfig +1 -0
@@ -111,6 +111,7 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_CFI=y CONFIG_E1000=y +CONFIG_RTC_RX8025=y CONFIG_BAUDRATE=9600 CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y
configs/socrates_defconfig +1 -0
@@ -37,6 +37,7 @@ CONFIG_SYS_FLASH_CFI=y CONFIG_PHY_MARVELL=y CONFIG_MII=y CONFIG_TSEC_ENET=y +CONFIG_RTC_RX8025=y CONFIG_SYS_NS16550=y CONFIG_USB=y # CONFIG_USB_EHCI_HCD is not set
configs/vme8349_defconfig +1 -0
@@ -114,6 +114,7 @@ CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_CFI=y CONFIG_PHY_MARVELL=y CONFIG_TSEC_ENET=y +CONFIG_RTC_RX8025=y CONFIG_BAUDRATE=9600 CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y
drivers/rtc/Kconfig +5 -0
@@ -86,6 +86,11 @@ config RTC_RX8010SJ help Support for Epson RX8010SJ Real Time Clock devices. +config RTC_RX8025 + bool "Enable RX8025 driver" + help + Support for Epson RX8025 Real Time Clock devices. + config RTC_PL031 bool "Enable ARM AMBA PL031 RTC driver" help
include/configs/caddy2.h +0 -1
@@ -225,7 +225,6 @@*/ #define CONFIG_SYS_RTC_BUS_NUM 0x01#define CONFIG_SYS_I2C_RTC_ADDR 0x32 -#define CONFIG_RTC_RX8025 /* Pass Ethernet MAC to VxWorks */ #define CONFIG_SYS_VXWORKS_MAC_PTR 0x000043f0
include/configs/socrates.h +0 -1
@@ -187,7 +187,6 @@#define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100/* I2C RTC */ -#define CONFIG_RTC_RX8025 /* Use Epson rx8025 rtc via i2c */ #define CONFIG_SYS_I2C_RTC_ADDR 0x32/* at address 0x32 */ /* I2C W83782G HW-Monitoring IC */
include/configs/vme8349.h +0 -1
@@ -225,7 +225,6 @@*/ #define CONFIG_SYS_RTC_BUS_NUM 0x01#define CONFIG_SYS_I2C_RTC_ADDR 0x32 -#define CONFIG_RTC_RX8025 /* Pass Ethernet MAC to VxWorks */ #define CONFIG_SYS_VXWORKS_MAC_PTR 0x000043f0
scripts/config_whitelist.txt +0 -1
@@ -1559,7 +1559,6 @@ CONFIG_RTC_MCP79411 CONFIG_RTC_MXS CONFIG_RTC_PCF8563 CONFIG_RTC_PT7C4338 -CONFIG_RTC_RX8025 CONFIG_RUN_FROM_DDR0 CONFIG_RUN_FROM_DDR1 CONFIG_RUN_FROM_IRAM_ONLY
Signature · 1 line
2.21.0
PATCH 1/3 rtc: move RTC_RX8025 to Kconfig
Quoted 3 lines · Heiko Schocher
move
RTC_RX8025toKconfigand fixup board configs.Signed-off-by Heiko Schocher <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190729/64344af1/attachment.sig>
PATCH 2/3 rtc, rx8025: fix Coding Style
In reply to Heiko Schocherfix Coding Style for this driver.
---
drivers/rtc/rx8025.c | 58 ++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 29 deletions(-)
drivers/rtc/rx8025.c +29 -29
@@ -70,12 +70,12 @@/* static uchar rtc_read (uchar reg); */ #define rtc_read (reg) buf[((reg) + 1) & 0xf] -static void rtc_write (uchar reg,uchar val); +static void rtc_write (uchar reg,uchar val);/* * Get the current time from the RTC */ -int rtc_get (struct rtc_time *tmp) +int rtc_get (struct rtc_time *tmp) {int rel =0 ;uchar sec, min, hour, mday, wday, mon, year, ctl2;
@@ -92,9 +92,9 @@ int rtc_get (struct rtc_time *tmp) 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); +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);/* dump status */ ctl2 =rtc_read (RTC_CTL2_REG_ADDR );
@@ -113,13 +113,14 @@ int rtc_get (struct rtc_time *tmp) rel =-1 ; } - tmp->tm_sec =bcd2bin (sec &0x7F ); - tmp->tm_min =bcd2bin (min &0x7F ); + tmp->tm_sec =bcd2bin (sec &0x7F ); + tmp->tm_min =bcd2bin (min &0x7F );if (rtc_read (RTC_CTL1_REG_ADDR ) &RTC_CTL1_BIT_2412 ) - tmp->tm_hour =bcd2bin (hour &0x3F ); + tmp->tm_hour =bcd2bin (hour &0x3F );else - tmp->tm_hour =bcd2bin (hour &0x1F ) %12 + + tmp->tm_hour =bcd2bin (hour &0x1F ) %12 + ((hour &0x20 ) ?12 :0 ); + tmp->tm_mday =bcd2bin (mday &0x3F ); tmp->tm_mon =bcd2bin (mon &0x1F ); tmp->tm_year =bcd2bin (year) + (bcd2bin (year) >=70 ?1900 :2000 );
@@ -127,9 +128,9 @@ int rtc_get (struct rtc_time *tmp) 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); +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; }
@@ -137,24 +138,24 @@ int rtc_get (struct rtc_time *tmp)/* * Set the RTC */ -int rtc_set (struct rtc_time *tmp) +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); +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)); -rtc_write (RTC_DAY_REG_ADDR ,bin2bcd (tmp->tm_wday)); -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)); +rtc_write (RTC_YR_REG_ADDR ,bin2bcd (tmp->tm_year %100 )); +rtc_write (RTC_MON_REG_ADDR ,bin2bcd (tmp->tm_mon)); +rtc_write (RTC_DAY_REG_ADDR ,bin2bcd (tmp->tm_wday)); +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)); -rtc_write (RTC_CTL1_REG_ADDR ,RTC_CTL1_BIT_2412 ); +rtc_write (RTC_CTL1_REG_ADDR ,RTC_CTL1_BIT_2412 );return 0 ; }
@@ -162,29 +163,28 @@ int rtc_set (struct rtc_time *tmp)/* * Reset the RTC */ -void rtc_reset (void ) +void rtc_reset (void ) {uchar buf[16 ];uchar ctl2; -if (i2c_read (CONFIG_SYS_I2C_RTC_ADDR ,0 ,0 , buf,16 )) +if (i2c_read (CONFIG_SYS_I2C_RTC_ADDR ,0 ,0 , buf,16 ))printf ("Error reading from RTC\n" ); ctl2 =rtc_read (RTC_CTL2_REG_ADDR ); ctl2 &= ~(RTC_CTL2_BIT_PON |RTC_CTL2_BIT_VDET ); ctl2 |=RTC_CTL2_BIT_XST |RTC_CTL2_BIT_VDSL ; -rtc_write (RTC_CTL2_REG_ADDR , ctl2); +rtc_write (RTC_CTL2_REG_ADDR , ctl2); }/* * Helper functions */ -static void rtc_write (uchar reg,uchar val) +static void rtc_write (uchar reg,uchar val) {uchar buf[2 ]; buf[0 ] = reg <<4 ; buf[1 ] = val;if (i2c_write (CONFIG_SYS_I2C_RTC_ADDR ,0 ,0 , buf,2 ) !=0 )printf ("Error writing to RTC\n" ); - }
Signature · 1 line
2.21.0
PATCH 2/3 rtc, rx8025: fix Coding Style
Quoted 3 lines · Heiko Schocher
fix Coding Style for this driver.
Signed-off-by Heiko Schocher <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190729/1093d119/attachment.sig>
PATCH 3/3 rtc, rx8025: add DM support
In reply to Heiko Schocheradd DM support for this RTC driver.
---
drivers/rtc/rx8025.c | 154 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 135 insertions(+), 19 deletions(-)
drivers/rtc/rx8025.c +135 -19
@@ -10,8 +10,9 @@#include <common.h> #include <command.h> -#include <rtc.h> +#include <dm.h> #include <i2c.h> +#include <rtc.h> /*---------------------------------------------------------------------*/ #undef DEBUG_RTC
@@ -27,6 +28,18 @@# define CONFIG_SYS_I2C_RTC_ADDR 0x32#endif +#ifdef CONFIG_DM_RTC +#define DEV_TYPE struct udevice +#else +/* Local udevice */ +struct ludevice { +u8 chip; +}; + +#define DEV_TYPE struct ludevice + +#endif +/* * RTC register addresses */
@@ -68,21 +81,35 @@*/ /* static uchar rtc_read (uchar reg); */ +#ifdef CONFIG_DM_RTC +/* +* on mpc85xx based board with DM and offset len 1 +* accessing rtc works fine. May we can drop this ? +*/ +#define rtc_read (reg) buf[(reg) & 0xf] +#else #define rtc_read (reg) buf[((reg) + 1) & 0xf] +#endif -static void rtc_write (uchar reg,uchar val); +static int rtc_write (DEV_TYPE *dev,uchar reg,uchar val);/* * Get the current time from the RTC */ -int rtc_get (struct rtc_time *tmp) +static int rx8025_rtc_get (DEV_TYPE *dev,struct rtc_time *tmp) {int rel =0 ;uchar sec, min, hour, mday, wday, mon, year, ctl2;uchar buf[16 ]; -if (i2c_read (CONFIG_SYS_I2C_RTC_ADDR ,0 ,0 , buf,16 )) +#ifdef CONFIG_DM_RTC +if (dm_i2c_read (dev,0 , buf,sizeof (buf))) { +#else +if (i2c_read (dev->chip,0 ,0 , buf,16 )) { +#endif printf ("Error reading from RTC\n" ); +return -EIO ; + } sec =rtc_read (RTC_SEC_REG_ADDR ); min =rtc_read (RTC_MIN_REG_ADDR );
@@ -138,7 +165,7 @@ int rtc_get(struct rtc_time *tmp)/* * Set the RTC */ -int rtc_set (struct rtc_time *tmp) +static int rx8025_rtc_set (DEV_TYPE *dev,const 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,
@@ -147,44 +174,133 @@ int rtc_set(struct rtc_time *tmp)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)); -rtc_write (RTC_DAY_REG_ADDR ,bin2bcd (tmp->tm_wday)); -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)); +if (rtc_write (dev,RTC_YR_REG_ADDR ,bin2bcd (tmp->tm_year %100 ))) +return -EIO ; -rtc_write (RTC_CTL1_REG_ADDR ,RTC_CTL1_BIT_2412 ); +if (rtc_write (dev,RTC_MON_REG_ADDR ,bin2bcd (tmp->tm_mon))) +return -EIO ; -return 0 ; +if (rtc_write (dev,RTC_DAY_REG_ADDR ,bin2bcd (tmp->tm_wday))) +return -EIO ; + +if (rtc_write (dev,RTC_DATE_REG_ADDR ,bin2bcd (tmp->tm_mday))) +return -EIO ; + +if (rtc_write (dev,RTC_HR_REG_ADDR ,bin2bcd (tmp->tm_hour))) +return -EIO ; + +if (rtc_write (dev,RTC_MIN_REG_ADDR ,bin2bcd (tmp->tm_min))) +return -EIO ; + +if (rtc_write (dev,RTC_SEC_REG_ADDR ,bin2bcd (tmp->tm_sec))) +return -EIO ; + +return rtc_write (dev,RTC_CTL1_REG_ADDR ,RTC_CTL1_BIT_2412 ); }/* * Reset the RTC */ -void rtc_reset (void ) +static int rx8025_rtc_reset(DEV_TYPE *dev) { uchar buf[16]; uchar ctl2; -if (i2c_read (CONFIG_SYS_I2C_RTC_ADDR ,0 ,0 , buf,16 )) +#ifdef CONFIG_DM_RTC + if (dm_i2c_read(dev, 0, buf, sizeof(buf))) { +#else + if (i2c_read(dev->chip, 0, 0, buf, 16)) { +#endif printf("Error reading from RTC\n"); + return -EIO; + } ctl2 = rtc_read(RTC_CTL2_REG_ADDR); ctl2 &= ~(RTC_CTL2_BIT_PON | RTC_CTL2_BIT_VDET); ctl2 |= RTC_CTL2_BIT_XST | RTC_CTL2_BIT_VDSL; -rtc_write (RTC_CTL2_REG_ADDR , ctl2); + + return rtc_write(dev, RTC_CTL2_REG_ADDR, ctl2); } /* * Helper functions */ -static void rtc_write (uchar reg,uchar val) +static int rtc_write(DEV_TYPE *dev, uchar reg, uchar val) { uchar buf[2]; buf[0] = reg << 4; buf[1] = val; -if (i2c_write (CONFIG_SYS_I2C_RTC_ADDR ,0 ,0 , buf,2 ) !=0 ) + +#ifdef CONFIG_DM_RTC + if (dm_i2c_write(dev, 0, buf, 2)) { +#else + if (i2c_write(dev->chip, 0, 0, buf, 2) != 0) { +#endif printf("Error writing to RTC\n"); + return -EIO; + } + + return 0; +} + +#ifdef CONFIG_DM_RTC +static int rx8025_probe(struct udevice *dev) +{ + uchar buf[16]; + int ret = 0; + + if (i2c_get_chip_offset_len(dev) != 1) + ret = i2c_set_chip_offset_len(dev, 1); + + if (ret) + return ret; + + return dm_i2c_read(dev, 0, buf, sizeof(buf)); +} + +static const struct rtc_ops rx8025_rtc_ops = { + .get = rx8025_rtc_get, + .set = rx8025_rtc_set, + .reset = rx8025_rtc_reset, +}; + +static const struct udevice_id rx8025_rtc_ids[] = { + { .compatible = "epson,rx8025" }, + { } +}; + +U_BOOT_DRIVER(rx8010sj_rtc) = { + .name = "rx8025_rtc", + .id = UCLASS_RTC, + .probe = rx8025_probe, + .of_match = rx8025_rtc_ids, + .ops = &rx8025_rtc_ops, +}; +#else +int rtc_get(struct rtc_time *tm) +{ + struct ludevice dev = { + .chip = CONFIG_SYS_I2C_RTC_ADDR, + }; + + return rx8025_rtc_get(&dev, tm); +} + +int rtc_set(struct rtc_time *tm) +{ + struct ludevice dev = { + .chip = CONFIG_SYS_I2C_RTC_ADDR, + }; + + return rx8025_rtc_set(&dev, tm); } + +void rtc_reset(void) +{ + struct ludevice dev = { + .chip = CONFIG_SYS_I2C_RTC_ADDR, + }; + + rx8025_rtc_reset(&dev); +} +#endif
Signature · 1 line
2.21.0
PATCH 3/3 rtc, rx8025: add DM support
Quoted 3 lines · Heiko Schocher
add DM support for this RTC driver.
Signed-off-by Heiko Schocher <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190729/7404faa7/attachment.sig>