* [U-Boot] [PATCH v4] rtc: Add DM support to ds3231 @ 2019-06-21 8:21 Chuanhua Han 2019-06-21 11:32 ` Lukasz Majewski 2019-07-18 23:56 ` [U-Boot] " Tom Rini 0 siblings, 2 replies; 7+ messages in thread From: Chuanhua Han @ 2019-06-21 8:21 UTC (permalink / raw) To: u-boot Add an implementation of the ds3231 driver that uses the driver model i2c APIs. Signed-off-by: Chuanhua Han <chuanhua.han@nxp.com> --- Changes in v4: - Delete the original 'rel' variable in the ds3231_rtc_get function, return 0 successfully, and return -EINVAL directly when the RTC oscillator is stopped. Changes in v3: - Update copyright information. Changes in v2: - Replace "#ifndef CONFIG_DM_RTC" with "#if !CONFIG_IS_ENABLED(DM_RTC)". drivers/rtc/ds3231.c | 107 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/drivers/rtc/ds3231.c b/drivers/rtc/ds3231.c index 9352ff87a2..79b026af4b 100644 --- a/drivers/rtc/ds3231.c +++ b/drivers/rtc/ds3231.c @@ -2,6 +2,9 @@ /* * (C) Copyright 2006 * Markus Klotzbuecher, mk at denx.de + * + * (C) Copyright 2019 NXP + * Chuanhua Han <chuanhua.han@nxp.com> */ /* @@ -13,6 +16,7 @@ #include <common.h> #include <command.h> +#include <dm.h> #include <rtc.h> #include <i2c.h> @@ -50,6 +54,7 @@ #define RTC_STAT_BIT_EN32KHZ 0x8 /* Enable 32KHz Output */ +#if !CONFIG_IS_ENABLED(DM_RTC) static uchar rtc_read (uchar reg); static void rtc_write (uchar reg, uchar val); @@ -164,3 +169,105 @@ static void rtc_write (uchar reg, uchar val) { i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val); } +#else +static int ds3231_rtc_get(struct udevice *dev, struct rtc_time *tmp) +{ + uchar sec, min, hour, mday, wday, mon_cent, year, status; + + status = dm_i2c_reg_read(dev, RTC_STAT_REG_ADDR); + sec = dm_i2c_reg_read(dev, RTC_SEC_REG_ADDR); + min = dm_i2c_reg_read(dev, RTC_MIN_REG_ADDR); + hour = dm_i2c_reg_read(dev, RTC_HR_REG_ADDR); + wday = dm_i2c_reg_read(dev, RTC_DAY_REG_ADDR); + mday = dm_i2c_reg_read(dev, RTC_DATE_REG_ADDR); + mon_cent = dm_i2c_reg_read(dev, RTC_MON_REG_ADDR); + year = dm_i2c_reg_read(dev, RTC_YR_REG_ADDR); + + if (status & RTC_STAT_BIT_OSF) { + printf("### Warning: RTC oscillator has stopped\n"); + /* clear the OSF flag */ + dm_i2c_reg_write(dev, RTC_STAT_REG_ADDR, + dm_i2c_reg_read(dev, RTC_STAT_REG_ADDR) + & ~RTC_STAT_BIT_OSF); + return -EINVAL; + } + + 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 0; +} + +static int ds3231_rtc_set(struct udevice *dev, const 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); + + dm_i2c_reg_write(dev, RTC_YR_REG_ADDR, bin2bcd(tmp->tm_year % 100)); + + century = (tmp->tm_year >= 2000) ? 0x80 : 0; + dm_i2c_reg_write(dev, RTC_MON_REG_ADDR, bin2bcd(tmp->tm_mon) | century); + + dm_i2c_reg_write(dev, RTC_DAY_REG_ADDR, bin2bcd(tmp->tm_wday + 1)); + dm_i2c_reg_write(dev, RTC_DATE_REG_ADDR, bin2bcd(tmp->tm_mday)); + dm_i2c_reg_write(dev, RTC_HR_REG_ADDR, bin2bcd(tmp->tm_hour)); + dm_i2c_reg_write(dev, RTC_MIN_REG_ADDR, bin2bcd(tmp->tm_min)); + dm_i2c_reg_write(dev, RTC_SEC_REG_ADDR, bin2bcd(tmp->tm_sec)); + + return 0; +} + +static int ds3231_rtc_reset(struct udevice *dev) +{ + int ret; + + ret = dm_i2c_reg_write(dev, RTC_CTL_REG_ADDR, + RTC_CTL_BIT_RS1 | RTC_CTL_BIT_RS2); + if (ret < 0) + return ret; + + return 0; +} + +static int ds3231_probe(struct udevice *dev) +{ + i2c_set_chip_flags(dev, DM_I2C_CHIP_RD_ADDRESS | + DM_I2C_CHIP_WR_ADDRESS); + + return 0; +} + +static const struct rtc_ops ds3231_rtc_ops = { + .get = ds3231_rtc_get, + .set = ds3231_rtc_set, + .reset = ds3231_rtc_reset, +}; + +static const struct udevice_id ds3231_rtc_ids[] = { + { .compatible = "dallas,ds3231" }, + { .compatible = "dallas,ds3232" }, + { } +}; + +U_BOOT_DRIVER(rtc_ds3231) = { + .name = "rtc-ds3231", + .id = UCLASS_RTC, + .probe = ds3231_probe, + .of_match = ds3231_rtc_ids, + .ops = &ds3231_rtc_ops, +}; +#endif -- 2.17.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH v4] rtc: Add DM support to ds3231 2019-06-21 8:21 [U-Boot] [PATCH v4] rtc: Add DM support to ds3231 Chuanhua Han @ 2019-06-21 11:32 ` Lukasz Majewski 2019-07-08 4:06 ` [U-Boot] [EXT] " Chuanhua Han 2019-07-16 2:34 ` Chuanhua Han 2019-07-18 23:56 ` [U-Boot] " Tom Rini 1 sibling, 2 replies; 7+ messages in thread From: Lukasz Majewski @ 2019-06-21 11:32 UTC (permalink / raw) To: u-boot On Fri, 21 Jun 2019 16:21:53 +0800 Chuanhua Han <chuanhua.han@nxp.com> wrote: > Add an implementation of the ds3231 driver that uses the driver > model i2c APIs. > > Signed-off-by: Chuanhua Han <chuanhua.han@nxp.com> > --- > Changes in v4: > - Delete the original 'rel' variable in the ds3231_rtc_get > function, return 0 successfully, and return -EINVAL directly > when the RTC oscillator is stopped. > Changes in v3: > - Update copyright information. > Changes in v2: > - Replace "#ifndef CONFIG_DM_RTC" with > "#if !CONFIG_IS_ENABLED(DM_RTC)". > > drivers/rtc/ds3231.c | 107 > +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 > insertions(+) > > diff --git a/drivers/rtc/ds3231.c b/drivers/rtc/ds3231.c > index 9352ff87a2..79b026af4b 100644 > --- a/drivers/rtc/ds3231.c > +++ b/drivers/rtc/ds3231.c > @@ -2,6 +2,9 @@ > /* > * (C) Copyright 2006 > * Markus Klotzbuecher, mk at denx.de > + * > + * (C) Copyright 2019 NXP > + * Chuanhua Han <chuanhua.han@nxp.com> > */ > > /* > @@ -13,6 +16,7 @@ > > #include <common.h> > #include <command.h> > +#include <dm.h> > #include <rtc.h> > #include <i2c.h> > > @@ -50,6 +54,7 @@ > #define RTC_STAT_BIT_EN32KHZ 0x8 /* Enable 32KHz > Output */ > > +#if !CONFIG_IS_ENABLED(DM_RTC) > static uchar rtc_read (uchar reg); > static void rtc_write (uchar reg, uchar val); > > @@ -164,3 +169,105 @@ static void rtc_write (uchar reg, uchar val) > { > i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val); > } > +#else > +static int ds3231_rtc_get(struct udevice *dev, struct rtc_time *tmp) > +{ > + uchar sec, min, hour, mday, wday, mon_cent, year, status; > + > + status = dm_i2c_reg_read(dev, RTC_STAT_REG_ADDR); > + sec = dm_i2c_reg_read(dev, RTC_SEC_REG_ADDR); > + min = dm_i2c_reg_read(dev, RTC_MIN_REG_ADDR); > + hour = dm_i2c_reg_read(dev, RTC_HR_REG_ADDR); > + wday = dm_i2c_reg_read(dev, RTC_DAY_REG_ADDR); > + mday = dm_i2c_reg_read(dev, RTC_DATE_REG_ADDR); > + mon_cent = dm_i2c_reg_read(dev, RTC_MON_REG_ADDR); > + year = dm_i2c_reg_read(dev, RTC_YR_REG_ADDR); > + > + if (status & RTC_STAT_BIT_OSF) { > + printf("### Warning: RTC oscillator has stopped\n"); > + /* clear the OSF flag */ > + dm_i2c_reg_write(dev, RTC_STAT_REG_ADDR, > + dm_i2c_reg_read(dev, > RTC_STAT_REG_ADDR) > + & ~RTC_STAT_BIT_OSF); > + return -EINVAL; > + } > + > + 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 0; > +} > + > +static int ds3231_rtc_set(struct udevice *dev, const 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); > + > + dm_i2c_reg_write(dev, RTC_YR_REG_ADDR, bin2bcd(tmp->tm_year > % 100)); + > + century = (tmp->tm_year >= 2000) ? 0x80 : 0; > + dm_i2c_reg_write(dev, RTC_MON_REG_ADDR, bin2bcd(tmp->tm_mon) > | century); + > + dm_i2c_reg_write(dev, RTC_DAY_REG_ADDR, bin2bcd(tmp->tm_wday > + 1)); > + dm_i2c_reg_write(dev, RTC_DATE_REG_ADDR, > bin2bcd(tmp->tm_mday)); > + dm_i2c_reg_write(dev, RTC_HR_REG_ADDR, > bin2bcd(tmp->tm_hour)); > + dm_i2c_reg_write(dev, RTC_MIN_REG_ADDR, > bin2bcd(tmp->tm_min)); > + dm_i2c_reg_write(dev, RTC_SEC_REG_ADDR, > bin2bcd(tmp->tm_sec)); + > + return 0; > +} > + > +static int ds3231_rtc_reset(struct udevice *dev) > +{ > + int ret; > + > + ret = dm_i2c_reg_write(dev, RTC_CTL_REG_ADDR, > + RTC_CTL_BIT_RS1 | RTC_CTL_BIT_RS2); > + if (ret < 0) > + return ret; > + > + return 0; > +} > + > +static int ds3231_probe(struct udevice *dev) > +{ > + i2c_set_chip_flags(dev, DM_I2C_CHIP_RD_ADDRESS | > + DM_I2C_CHIP_WR_ADDRESS); > + > + return 0; > +} > + > +static const struct rtc_ops ds3231_rtc_ops = { > + .get = ds3231_rtc_get, > + .set = ds3231_rtc_set, > + .reset = ds3231_rtc_reset, > +}; > + > +static const struct udevice_id ds3231_rtc_ids[] = { > + { .compatible = "dallas,ds3231" }, > + { .compatible = "dallas,ds3232" }, > + { } > +}; > + > +U_BOOT_DRIVER(rtc_ds3231) = { > + .name = "rtc-ds3231", > + .id = UCLASS_RTC, > + .probe = ds3231_probe, > + .of_match = ds3231_rtc_ids, > + .ops = &ds3231_rtc_ops, > +}; > +#endif Reviewed-by: Lukasz Majewski <lukma@denx.de> Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 488 bytes Desc: OpenPGP digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190621/1da83cbd/attachment.sig> ^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [EXT] Re: [PATCH v4] rtc: Add DM support to ds3231 2019-06-21 11:32 ` Lukasz Majewski @ 2019-07-08 4:06 ` Chuanhua Han 2019-07-16 2:34 ` Chuanhua Han 1 sibling, 0 replies; 7+ messages in thread From: Chuanhua Han @ 2019-07-08 4:06 UTC (permalink / raw) To: u-boot > -----Original Message----- > From: Lukasz Majewski <lukma@denx.de> > Sent: 2019年6月21日 19:33 > To: Chuanhua Han <chuanhua.han@nxp.com> > Cc: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>; > u-boot at lists.denx.de > Subject: [EXT] Re: [PATCH v4] rtc: Add DM support to ds3231 > > On Fri, 21 Jun 2019 16:21:53 +0800 > Chuanhua Han <chuanhua.han@nxp.com> wrote: > > > Add an implementation of the ds3231 driver that uses the driver model > > i2c APIs. > > > > Signed-off-by: Chuanhua Han <chuanhua.han@nxp.com> > > --- > > Changes in v4: > > - Delete the original 'rel' variable in the ds3231_rtc_get function, > > return 0 successfully, and return -EINVAL directly when the RTC > > oscillator is stopped. > > Changes in v3: > > - Update copyright information. > > Changes in v2: > > - Replace "#ifndef CONFIG_DM_RTC" with "#if > > !CONFIG_IS_ENABLED(DM_RTC)". > > > > drivers/rtc/ds3231.c | 107 > > +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 > > insertions(+) > > > > diff --git a/drivers/rtc/ds3231.c b/drivers/rtc/ds3231.c index > > 9352ff87a2..79b026af4b 100644 > > --- a/drivers/rtc/ds3231.c > > +++ b/drivers/rtc/ds3231.c > > @@ -2,6 +2,9 @@ > > /* > > * (C) Copyright 2006 > > * Markus Klotzbuecher, mk at denx.de > > + * > > + * (C) Copyright 2019 NXP > > + * Chuanhua Han <chuanhua.han@nxp.com> > > */ > > > > /* > > @@ -13,6 +16,7 @@ > > > > #include <common.h> > > #include <command.h> > > +#include <dm.h> > > #include <rtc.h> > > #include <i2c.h> > > > > @@ -50,6 +54,7 @@ > > #define RTC_STAT_BIT_EN32KHZ 0x8 /* Enable 32KHz > > Output */ > > > > +#if !CONFIG_IS_ENABLED(DM_RTC) > > static uchar rtc_read (uchar reg); > > static void rtc_write (uchar reg, uchar val); > > > > @@ -164,3 +169,105 @@ static void rtc_write (uchar reg, uchar val) { > > i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val); } > > +#else > > +static int ds3231_rtc_get(struct udevice *dev, struct rtc_time *tmp) > > +{ > > + uchar sec, min, hour, mday, wday, mon_cent, year, status; > > + > > + status = dm_i2c_reg_read(dev, RTC_STAT_REG_ADDR); > > + sec = dm_i2c_reg_read(dev, RTC_SEC_REG_ADDR); > > + min = dm_i2c_reg_read(dev, RTC_MIN_REG_ADDR); > > + hour = dm_i2c_reg_read(dev, RTC_HR_REG_ADDR); > > + wday = dm_i2c_reg_read(dev, RTC_DAY_REG_ADDR); > > + mday = dm_i2c_reg_read(dev, RTC_DATE_REG_ADDR); > > + mon_cent = dm_i2c_reg_read(dev, RTC_MON_REG_ADDR); > > + year = dm_i2c_reg_read(dev, RTC_YR_REG_ADDR); > > + > > + if (status & RTC_STAT_BIT_OSF) { > > + printf("### Warning: RTC oscillator has stopped\n"); > > + /* clear the OSF flag */ > > + dm_i2c_reg_write(dev, RTC_STAT_REG_ADDR, > > + dm_i2c_reg_read(dev, > > RTC_STAT_REG_ADDR) > > + & ~RTC_STAT_BIT_OSF); > > + return -EINVAL; > > + } > > + > > + 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 0; > > +} > > + > > +static int ds3231_rtc_set(struct udevice *dev, const 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); > > + > > + dm_i2c_reg_write(dev, RTC_YR_REG_ADDR, bin2bcd(tmp->tm_year > > % 100)); + > > + century = (tmp->tm_year >= 2000) ? 0x80 : 0; > > + dm_i2c_reg_write(dev, RTC_MON_REG_ADDR, bin2bcd(tmp->tm_mon) > > | century); + > > + dm_i2c_reg_write(dev, RTC_DAY_REG_ADDR, bin2bcd(tmp->tm_wday > 1)); > > + dm_i2c_reg_write(dev, RTC_DATE_REG_ADDR, > > bin2bcd(tmp->tm_mday)); > > + dm_i2c_reg_write(dev, RTC_HR_REG_ADDR, > > bin2bcd(tmp->tm_hour)); > > + dm_i2c_reg_write(dev, RTC_MIN_REG_ADDR, > > bin2bcd(tmp->tm_min)); > > + dm_i2c_reg_write(dev, RTC_SEC_REG_ADDR, > > bin2bcd(tmp->tm_sec)); + > > + return 0; > > +} > > + > > +static int ds3231_rtc_reset(struct udevice *dev) { > > + int ret; > > + > > + ret = dm_i2c_reg_write(dev, RTC_CTL_REG_ADDR, > > + RTC_CTL_BIT_RS1 | RTC_CTL_BIT_RS2); > > + if (ret < 0) > > + return ret; > > + > > + return 0; > > +} > > + > > +static int ds3231_probe(struct udevice *dev) { > > + i2c_set_chip_flags(dev, DM_I2C_CHIP_RD_ADDRESS | > > + DM_I2C_CHIP_WR_ADDRESS); > > + > > + return 0; > > +} > > + > > +static const struct rtc_ops ds3231_rtc_ops = { > > + .get = ds3231_rtc_get, > > + .set = ds3231_rtc_set, > > + .reset = ds3231_rtc_reset, > > +}; > > + > > +static const struct udevice_id ds3231_rtc_ids[] = { > > + { .compatible = "dallas,ds3231" }, > > + { .compatible = "dallas,ds3232" }, > > + { } > > +}; > > + > > +U_BOOT_DRIVER(rtc_ds3231) = { > > + .name = "rtc-ds3231", > > + .id = UCLASS_RTC, > > + .probe = ds3231_probe, > > + .of_match = ds3231_rtc_ids, > > + .ops = &ds3231_rtc_ops, > > +}; > > +#endif > > Reviewed-by: Lukasz Majewski <lukma@denx.de> Hi, Any other questions? Whether can merge into the uboot mainlines? Thanks! > > > Best regards, > > Lukasz Majewski > > -- > > DENX Software Engineering GmbH, Managing Director: Wolfgang Denk > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany > Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: > lukma at denx.de ^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [EXT] Re: [PATCH v4] rtc: Add DM support to ds3231 2019-06-21 11:32 ` Lukasz Majewski 2019-07-08 4:06 ` [U-Boot] [EXT] " Chuanhua Han @ 2019-07-16 2:34 ` Chuanhua Han 2019-07-16 7:06 ` Lukasz Majewski 1 sibling, 1 reply; 7+ messages in thread From: Chuanhua Han @ 2019-07-16 2:34 UTC (permalink / raw) To: u-boot Hi, Lukasz Majewski > -----Original Message----- > From: Lukasz Majewski <lukma@denx.de> > Sent: 2019年6月21日 19:33 > To: Chuanhua Han <chuanhua.han@nxp.com> > Cc: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>; > u-boot at lists.denx.de > Subject: [EXT] Re: [PATCH v4] rtc: Add DM support to ds3231 > > On Fri, 21 Jun 2019 16:21:53 +0800 > Chuanhua Han <chuanhua.han@nxp.com> wrote: > > > Add an implementation of the ds3231 driver that uses the driver model > > i2c APIs. > > > > Signed-off-by: Chuanhua Han <chuanhua.han@nxp.com> > > --- > > Changes in v4: > > - Delete the original 'rel' variable in the ds3231_rtc_get function, > > return 0 successfully, and return -EINVAL directly when the RTC > > oscillator is stopped. > > Changes in v3: > > - Update copyright information. > > Changes in v2: > > - Replace "#ifndef CONFIG_DM_RTC" with "#if > > !CONFIG_IS_ENABLED(DM_RTC)". > > > > drivers/rtc/ds3231.c | 107 > > +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 > > insertions(+) > > > > diff --git a/drivers/rtc/ds3231.c b/drivers/rtc/ds3231.c index > > 9352ff87a2..79b026af4b 100644 > > --- a/drivers/rtc/ds3231.c > > +++ b/drivers/rtc/ds3231.c > > @@ -2,6 +2,9 @@ > > /* > > * (C) Copyright 2006 > > * Markus Klotzbuecher, mk at denx.de > > + * > > + * (C) Copyright 2019 NXP > > + * Chuanhua Han <chuanhua.han@nxp.com> > > */ > > > > /* > > @@ -13,6 +16,7 @@ > > > > #include <common.h> > > #include <command.h> > > +#include <dm.h> > > #include <rtc.h> > > #include <i2c.h> > > > > @@ -50,6 +54,7 @@ > > #define RTC_STAT_BIT_EN32KHZ 0x8 /* Enable 32KHz > > Output */ > > > > +#if !CONFIG_IS_ENABLED(DM_RTC) > > static uchar rtc_read (uchar reg); > > static void rtc_write (uchar reg, uchar val); > > > > @@ -164,3 +169,105 @@ static void rtc_write (uchar reg, uchar val) { > > i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val); } > > +#else > > +static int ds3231_rtc_get(struct udevice *dev, struct rtc_time *tmp) > > +{ > > + uchar sec, min, hour, mday, wday, mon_cent, year, status; > > + > > + status = dm_i2c_reg_read(dev, RTC_STAT_REG_ADDR); > > + sec = dm_i2c_reg_read(dev, RTC_SEC_REG_ADDR); > > + min = dm_i2c_reg_read(dev, RTC_MIN_REG_ADDR); > > + hour = dm_i2c_reg_read(dev, RTC_HR_REG_ADDR); > > + wday = dm_i2c_reg_read(dev, RTC_DAY_REG_ADDR); > > + mday = dm_i2c_reg_read(dev, RTC_DATE_REG_ADDR); > > + mon_cent = dm_i2c_reg_read(dev, RTC_MON_REG_ADDR); > > + year = dm_i2c_reg_read(dev, RTC_YR_REG_ADDR); > > + > > + if (status & RTC_STAT_BIT_OSF) { > > + printf("### Warning: RTC oscillator has stopped\n"); > > + /* clear the OSF flag */ > > + dm_i2c_reg_write(dev, RTC_STAT_REG_ADDR, > > + dm_i2c_reg_read(dev, > > RTC_STAT_REG_ADDR) > > + & ~RTC_STAT_BIT_OSF); > > + return -EINVAL; > > + } > > + > > + 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 0; > > +} > > + > > +static int ds3231_rtc_set(struct udevice *dev, const 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); > > + > > + dm_i2c_reg_write(dev, RTC_YR_REG_ADDR, bin2bcd(tmp->tm_year > > % 100)); + > > + century = (tmp->tm_year >= 2000) ? 0x80 : 0; > > + dm_i2c_reg_write(dev, RTC_MON_REG_ADDR, bin2bcd(tmp->tm_mon) > > | century); + > > + dm_i2c_reg_write(dev, RTC_DAY_REG_ADDR, bin2bcd(tmp->tm_wday > 1)); > > + dm_i2c_reg_write(dev, RTC_DATE_REG_ADDR, > > bin2bcd(tmp->tm_mday)); > > + dm_i2c_reg_write(dev, RTC_HR_REG_ADDR, > > bin2bcd(tmp->tm_hour)); > > + dm_i2c_reg_write(dev, RTC_MIN_REG_ADDR, > > bin2bcd(tmp->tm_min)); > > + dm_i2c_reg_write(dev, RTC_SEC_REG_ADDR, > > bin2bcd(tmp->tm_sec)); + > > + return 0; > > +} > > + > > +static int ds3231_rtc_reset(struct udevice *dev) { > > + int ret; > > + > > + ret = dm_i2c_reg_write(dev, RTC_CTL_REG_ADDR, > > + RTC_CTL_BIT_RS1 | RTC_CTL_BIT_RS2); > > + if (ret < 0) > > + return ret; > > + > > + return 0; > > +} > > + > > +static int ds3231_probe(struct udevice *dev) { > > + i2c_set_chip_flags(dev, DM_I2C_CHIP_RD_ADDRESS | > > + DM_I2C_CHIP_WR_ADDRESS); > > + > > + return 0; > > +} > > + > > +static const struct rtc_ops ds3231_rtc_ops = { > > + .get = ds3231_rtc_get, > > + .set = ds3231_rtc_set, > > + .reset = ds3231_rtc_reset, > > +}; > > + > > +static const struct udevice_id ds3231_rtc_ids[] = { > > + { .compatible = "dallas,ds3231" }, > > + { .compatible = "dallas,ds3232" }, > > + { } > > +}; > > + > > +U_BOOT_DRIVER(rtc_ds3231) = { > > + .name = "rtc-ds3231", > > + .id = UCLASS_RTC, > > + .probe = ds3231_probe, > > + .of_match = ds3231_rtc_ids, > > + .ops = &ds3231_rtc_ops, > > +}; > > +#endif > > Reviewed-by: Lukasz Majewski <lukma@denx.de> Does this patch need to be modified? Can this patch be merged with the mainline of uboot? Looking forward to your reply. Thank you very much! > > > Best regards, > > Lukasz Majewski > > -- > > DENX Software Engineering GmbH, Managing Director: Wolfgang Denk > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany > Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: > lukma at denx.de ^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [EXT] Re: [PATCH v4] rtc: Add DM support to ds3231 2019-07-16 2:34 ` Chuanhua Han @ 2019-07-16 7:06 ` Lukasz Majewski 2019-07-16 7:12 ` Chuanhua Han 0 siblings, 1 reply; 7+ messages in thread From: Lukasz Majewski @ 2019-07-16 7:06 UTC (permalink / raw) To: u-boot Hi Chuanhua, > Hi, Lukasz Majewski > > > -----Original Message----- > > From: Lukasz Majewski <lukma@denx.de> > > Sent: 2019年6月21日 19:33 > > To: Chuanhua Han <chuanhua.han@nxp.com> > > Cc: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>; > > u-boot at lists.denx.de > > Subject: [EXT] Re: [PATCH v4] rtc: Add DM support to ds3231 > > > > On Fri, 21 Jun 2019 16:21:53 +0800 > > Chuanhua Han <chuanhua.han@nxp.com> wrote: > > > > > Add an implementation of the ds3231 driver that uses the driver > > > model i2c APIs. > > > > > > Signed-off-by: Chuanhua Han <chuanhua.han@nxp.com> > > > --- > > > Changes in v4: > > > - Delete the original 'rel' variable in the > > > ds3231_rtc_get function, return 0 successfully, and return > > > -EINVAL directly when the RTC oscillator is stopped. > > > Changes in v3: > > > - Update copyright information. > > > Changes in v2: > > > - Replace "#ifndef CONFIG_DM_RTC" with "#if > > > !CONFIG_IS_ENABLED(DM_RTC)". > > > > > > drivers/rtc/ds3231.c | 107 > > > +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 > > > insertions(+) > > > > > > diff --git a/drivers/rtc/ds3231.c b/drivers/rtc/ds3231.c index > > > 9352ff87a2..79b026af4b 100644 > > > --- a/drivers/rtc/ds3231.c > > > +++ b/drivers/rtc/ds3231.c > > > @@ -2,6 +2,9 @@ > > > /* > > > * (C) Copyright 2006 > > > * Markus Klotzbuecher, mk at denx.de > > > + * > > > + * (C) Copyright 2019 NXP > > > + * Chuanhua Han <chuanhua.han@nxp.com> > > > */ > > > > > > /* > > > @@ -13,6 +16,7 @@ > > > > > > #include <common.h> > > > #include <command.h> > > > +#include <dm.h> > > > #include <rtc.h> > > > #include <i2c.h> > > > > > > @@ -50,6 +54,7 @@ > > > #define RTC_STAT_BIT_EN32KHZ 0x8 /* Enable 32KHz > > > Output */ > > > > > > +#if !CONFIG_IS_ENABLED(DM_RTC) > > > static uchar rtc_read (uchar reg); > > > static void rtc_write (uchar reg, uchar val); > > > > > > @@ -164,3 +169,105 @@ static void rtc_write (uchar reg, uchar > > > val) { i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val); } > > > +#else > > > +static int ds3231_rtc_get(struct udevice *dev, struct rtc_time > > > *tmp) +{ > > > + uchar sec, min, hour, mday, wday, mon_cent, year, status; > > > + > > > + status = dm_i2c_reg_read(dev, RTC_STAT_REG_ADDR); > > > + sec = dm_i2c_reg_read(dev, RTC_SEC_REG_ADDR); > > > + min = dm_i2c_reg_read(dev, RTC_MIN_REG_ADDR); > > > + hour = dm_i2c_reg_read(dev, RTC_HR_REG_ADDR); > > > + wday = dm_i2c_reg_read(dev, RTC_DAY_REG_ADDR); > > > + mday = dm_i2c_reg_read(dev, RTC_DATE_REG_ADDR); > > > + mon_cent = dm_i2c_reg_read(dev, RTC_MON_REG_ADDR); > > > + year = dm_i2c_reg_read(dev, RTC_YR_REG_ADDR); > > > + > > > + if (status & RTC_STAT_BIT_OSF) { > > > + printf("### Warning: RTC oscillator has > > > stopped\n"); > > > + /* clear the OSF flag */ > > > + dm_i2c_reg_write(dev, RTC_STAT_REG_ADDR, > > > + dm_i2c_reg_read(dev, > > > RTC_STAT_REG_ADDR) > > > + & > > > ~RTC_STAT_BIT_OSF); > > > + return -EINVAL; > > > + } > > > + > > > + 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 0; > > > +} > > > + > > > +static int ds3231_rtc_set(struct udevice *dev, const 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); > > > + > > > + dm_i2c_reg_write(dev, RTC_YR_REG_ADDR, > > > bin2bcd(tmp->tm_year % 100)); + > > > + century = (tmp->tm_year >= 2000) ? 0x80 : 0; > > > + dm_i2c_reg_write(dev, RTC_MON_REG_ADDR, > > > bin2bcd(tmp->tm_mon) | century); + > > > + dm_i2c_reg_write(dev, RTC_DAY_REG_ADDR, > > > bin2bcd(tmp->tm_wday > > 1)); > > > + dm_i2c_reg_write(dev, RTC_DATE_REG_ADDR, > > > bin2bcd(tmp->tm_mday)); > > > + dm_i2c_reg_write(dev, RTC_HR_REG_ADDR, > > > bin2bcd(tmp->tm_hour)); > > > + dm_i2c_reg_write(dev, RTC_MIN_REG_ADDR, > > > bin2bcd(tmp->tm_min)); > > > + dm_i2c_reg_write(dev, RTC_SEC_REG_ADDR, > > > bin2bcd(tmp->tm_sec)); + > > > + return 0; > > > +} > > > + > > > +static int ds3231_rtc_reset(struct udevice *dev) { > > > + int ret; > > > + > > > + ret = dm_i2c_reg_write(dev, RTC_CTL_REG_ADDR, > > > + RTC_CTL_BIT_RS1 | > > > RTC_CTL_BIT_RS2); > > > + if (ret < 0) > > > + return ret; > > > + > > > + return 0; > > > +} > > > + > > > +static int ds3231_probe(struct udevice *dev) { > > > + i2c_set_chip_flags(dev, DM_I2C_CHIP_RD_ADDRESS | > > > + DM_I2C_CHIP_WR_ADDRESS); > > > + > > > + return 0; > > > +} > > > + > > > +static const struct rtc_ops ds3231_rtc_ops = { > > > + .get = ds3231_rtc_get, > > > + .set = ds3231_rtc_set, > > > + .reset = ds3231_rtc_reset, > > > +}; > > > + > > > +static const struct udevice_id ds3231_rtc_ids[] = { > > > + { .compatible = "dallas,ds3231" }, > > > + { .compatible = "dallas,ds3232" }, > > > + { } > > > +}; > > > + > > > +U_BOOT_DRIVER(rtc_ds3231) = { > > > + .name = "rtc-ds3231", > > > + .id = UCLASS_RTC, > > > + .probe = ds3231_probe, > > > + .of_match = ds3231_rtc_ids, > > > + .ops = &ds3231_rtc_ops, > > > +}; > > > +#endif > > > > Reviewed-by: Lukasz Majewski <lukma@denx.de> > Does this patch need to be modified? > Can this patch be merged with the mainline of uboot? If there are no other comments, then yes - this patch is eligible for upstreaming. > Looking forward to your reply. Thank you very much! In the patchwork [1] - there is a delegate assigned - in this case Tom Rini is supposed to pull this patch. I've added Tom to CC, so maybe he will pull this code soon. Note: [1] - https://patchwork.ozlabs.org/patch/1120001/ > > > > > > Best regards, > > > > Lukasz Majewski > > > > -- > > > > DENX Software Engineering GmbH, Managing Director: Wolfgang > > Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, > > Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: > > lukma at denx.de Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 488 bytes Desc: OpenPGP digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190716/7c03310f/attachment.sig> ^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [EXT] Re: [PATCH v4] rtc: Add DM support to ds3231 2019-07-16 7:06 ` Lukasz Majewski @ 2019-07-16 7:12 ` Chuanhua Han 0 siblings, 0 replies; 7+ messages in thread From: Chuanhua Han @ 2019-07-16 7:12 UTC (permalink / raw) To: u-boot Hi,tom and Lukasz > -----Original Message----- > From: Lukasz Majewski <lukma@denx.de> > Sent: 2019年7月16日 15:07 > To: Chuanhua Han <chuanhua.han@nxp.com> > Cc: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>; > u-boot at lists.denx.de; Tom Rini <trini@konsulko.com> > Subject: Re: [EXT] Re: [PATCH v4] rtc: Add DM support to ds3231 > > Hi Chuanhua, > > > Hi, Lukasz Majewski > > > > > -----Original Message----- > > > From: Lukasz Majewski <lukma@denx.de> > > > Sent: 2019年6月21日 19:33 > > > To: Chuanhua Han <chuanhua.han@nxp.com> > > > Cc: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>; > > > u-boot at lists.denx.de > > > Subject: [EXT] Re: [PATCH v4] rtc: Add DM support to ds3231 > > > > > > On Fri, 21 Jun 2019 16:21:53 +0800 > > > Chuanhua Han <chuanhua.han@nxp.com> wrote: > > > > > > > Add an implementation of the ds3231 driver that uses the driver > > > > model i2c APIs. > > > > > > > > Signed-off-by: Chuanhua Han <chuanhua.han@nxp.com> > > > > --- > > > > Changes in v4: > > > > - Delete the original 'rel' variable in the ds3231_rtc_get > > > > function, return 0 successfully, and return -EINVAL directly when > > > > the RTC oscillator is stopped. > > > > Changes in v3: > > > > - Update copyright information. > > > > Changes in v2: > > > > - Replace "#ifndef CONFIG_DM_RTC" with "#if > > > > !CONFIG_IS_ENABLED(DM_RTC)". > > > > > > > > drivers/rtc/ds3231.c | 107 > > > > +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, > 107 > > > > insertions(+) > > > > > > > > diff --git a/drivers/rtc/ds3231.c b/drivers/rtc/ds3231.c index > > > > 9352ff87a2..79b026af4b 100644 > > > > --- a/drivers/rtc/ds3231.c > > > > +++ b/drivers/rtc/ds3231.c > > > > @@ -2,6 +2,9 @@ > > > > /* > > > > * (C) Copyright 2006 > > > > * Markus Klotzbuecher, mk at denx.de > > > > + * > > > > + * (C) Copyright 2019 NXP > > > > + * Chuanhua Han <chuanhua.han@nxp.com> > > > > */ > > > > > > > > /* > > > > @@ -13,6 +16,7 @@ > > > > > > > > #include <common.h> > > > > #include <command.h> > > > > +#include <dm.h> > > > > #include <rtc.h> > > > > #include <i2c.h> > > > > > > > > @@ -50,6 +54,7 @@ > > > > #define RTC_STAT_BIT_EN32KHZ 0x8 /* Enable 32KHz > > > > Output */ > > > > > > > > +#if !CONFIG_IS_ENABLED(DM_RTC) > > > > static uchar rtc_read (uchar reg); static void rtc_write (uchar > > > > reg, uchar val); > > > > > > > > @@ -164,3 +169,105 @@ static void rtc_write (uchar reg, uchar > > > > val) { i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val); } > > > > +#else > > > > +static int ds3231_rtc_get(struct udevice *dev, struct rtc_time > > > > *tmp) +{ > > > > + uchar sec, min, hour, mday, wday, mon_cent, year, status; > > > > + > > > > + status = dm_i2c_reg_read(dev, RTC_STAT_REG_ADDR); > > > > + sec = dm_i2c_reg_read(dev, RTC_SEC_REG_ADDR); > > > > + min = dm_i2c_reg_read(dev, RTC_MIN_REG_ADDR); > > > > + hour = dm_i2c_reg_read(dev, RTC_HR_REG_ADDR); > > > > + wday = dm_i2c_reg_read(dev, RTC_DAY_REG_ADDR); > > > > + mday = dm_i2c_reg_read(dev, RTC_DATE_REG_ADDR); > > > > + mon_cent = dm_i2c_reg_read(dev, RTC_MON_REG_ADDR); > > > > + year = dm_i2c_reg_read(dev, RTC_YR_REG_ADDR); > > > > + > > > > + if (status & RTC_STAT_BIT_OSF) { > > > > + printf("### Warning: RTC oscillator has > > > > stopped\n"); > > > > + /* clear the OSF flag */ > > > > + dm_i2c_reg_write(dev, RTC_STAT_REG_ADDR, > > > > + dm_i2c_reg_read(dev, > > > > RTC_STAT_REG_ADDR) > > > > + & > > > > ~RTC_STAT_BIT_OSF); > > > > + return -EINVAL; > > > > + } > > > > + > > > > + 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 0; > > > > +} > > > > + > > > > +static int ds3231_rtc_set(struct udevice *dev, const 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); > > > > + > > > > + dm_i2c_reg_write(dev, RTC_YR_REG_ADDR, > > > > bin2bcd(tmp->tm_year % 100)); + > > > > + century = (tmp->tm_year >= 2000) ? 0x80 : 0; > > > > + dm_i2c_reg_write(dev, RTC_MON_REG_ADDR, > > > > bin2bcd(tmp->tm_mon) | century); + > > > > + dm_i2c_reg_write(dev, RTC_DAY_REG_ADDR, > > > > bin2bcd(tmp->tm_wday > > > 1)); > > > > + dm_i2c_reg_write(dev, RTC_DATE_REG_ADDR, > > > > bin2bcd(tmp->tm_mday)); > > > > + dm_i2c_reg_write(dev, RTC_HR_REG_ADDR, > > > > bin2bcd(tmp->tm_hour)); > > > > + dm_i2c_reg_write(dev, RTC_MIN_REG_ADDR, > > > > bin2bcd(tmp->tm_min)); > > > > + dm_i2c_reg_write(dev, RTC_SEC_REG_ADDR, > > > > bin2bcd(tmp->tm_sec)); + > > > > + return 0; > > > > +} > > > > + > > > > +static int ds3231_rtc_reset(struct udevice *dev) { > > > > + int ret; > > > > + > > > > + ret = dm_i2c_reg_write(dev, RTC_CTL_REG_ADDR, > > > > + RTC_CTL_BIT_RS1 | > > > > RTC_CTL_BIT_RS2); > > > > + if (ret < 0) > > > > + return ret; > > > > + > > > > + return 0; > > > > +} > > > > + > > > > +static int ds3231_probe(struct udevice *dev) { > > > > + i2c_set_chip_flags(dev, DM_I2C_CHIP_RD_ADDRESS | > > > > + DM_I2C_CHIP_WR_ADDRESS); > > > > + > > > > + return 0; > > > > +} > > > > + > > > > +static const struct rtc_ops ds3231_rtc_ops = { > > > > + .get = ds3231_rtc_get, > > > > + .set = ds3231_rtc_set, > > > > + .reset = ds3231_rtc_reset, > > > > +}; > > > > + > > > > +static const struct udevice_id ds3231_rtc_ids[] = { > > > > + { .compatible = "dallas,ds3231" }, > > > > + { .compatible = "dallas,ds3232" }, > > > > + { } > > > > +}; > > > > + > > > > +U_BOOT_DRIVER(rtc_ds3231) = { > > > > + .name = "rtc-ds3231", > > > > + .id = UCLASS_RTC, > > > > + .probe = ds3231_probe, > > > > + .of_match = ds3231_rtc_ids, > > > > + .ops = &ds3231_rtc_ops, > > > > +}; > > > > +#endif > > > > > > Reviewed-by: Lukasz Majewski <lukma@denx.de> > > Does this patch need to be modified? > > Can this patch be merged with the mainline of uboot? > > If there are no other comments, then yes - this patch is eligible for > upstreaming. > > > Looking forward to your reply. Thank you very much! > > In the patchwork [1] - there is a delegate assigned - in this case Tom Rini is > supposed to pull this patch. > > I've added Tom to CC, so maybe he will pull this code soon. Thank you very much!!! > > Note: > > [1] - https://patchwork.ozlabs.org/patch/1120001/ > > > > > > > > > > Best regards, > > > > > > Lukasz Majewski > > > > > > -- > > > > > > DENX Software Engineering GmbH, Managing Director: Wolfgang > > > Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, > > > Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: > > > lukma at denx.de > > > > > Best regards, > > Lukasz Majewski > > -- > > DENX Software Engineering GmbH, Managing Director: Wolfgang Denk > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany > Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: > lukma at denx.de ^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH v4] rtc: Add DM support to ds3231 2019-06-21 8:21 [U-Boot] [PATCH v4] rtc: Add DM support to ds3231 Chuanhua Han 2019-06-21 11:32 ` Lukasz Majewski @ 2019-07-18 23:56 ` Tom Rini 1 sibling, 0 replies; 7+ messages in thread From: Tom Rini @ 2019-07-18 23:56 UTC (permalink / raw) To: u-boot On Fri, Jun 21, 2019 at 04:21:53PM +0800, Chuanhua Han wrote: > Add an implementation of the ds3231 driver that uses the driver > model i2c APIs. > > Signed-off-by: Chuanhua Han <chuanhua.han@nxp.com> > Reviewed-by: Lukasz Majewski <lukma@denx.de> Applied to u-boot/master, thanks! -- 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/20190718/5df3235a/attachment.sig> ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-07-18 23:56 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-06-21 8:21 [U-Boot] [PATCH v4] rtc: Add DM support to ds3231 Chuanhua Han 2019-06-21 11:32 ` Lukasz Majewski 2019-07-08 4:06 ` [U-Boot] [EXT] " Chuanhua Han 2019-07-16 2:34 ` Chuanhua Han 2019-07-16 7:06 ` Lukasz Majewski 2019-07-16 7:12 ` Chuanhua Han 2019-07-18 23:56 ` [U-Boot] " Tom Rini
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox