rtc: ds1672: set range
Alexandre Belloni
maintainerPATCH 1/8 rtc: ds1672: set range
The ds1672 is a 32bit seconds counter.
Also remove erroneous comment claiming that epoch is set to 2000, it was not.
--- drivers/rtc/rtc-ds1672.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/rtc/rtc-ds1672.c +11 -5
@@ -21,12 +21,10 @@#define DS1672_REG_CONTROL_EOSC 0x80 -static struct i2c_driver ds1672_driver; -/* * In the routines that deal directly with the ds1672 hardware, we use * rtc_time -- month 0-11, hour 0-23, yr = calendar year-epoch -* Epoch is initialized as 2000. Time is set to UTC. +* Time is set to UTC. */ static int ds1672_get_datetime (struct i2c_client *client,struct rtc_time *tm) {
@@ -164,8 +162,16 @@ static int ds1672_probe(struct i2c_client *client,if (!i2c_check_functionality (client->adapter,I2C_FUNC_I2C ))return -ENODEV ; - rtc =devm_rtc_device_register (&client->dev, ds1672_driver.driver.name, - &ds1672_rtc_ops,THIS_MODULE ); + rtc =devm_rtc_allocate_device (&client->dev); +if (IS_ERR (rtc)) +return PTR_ERR (rtc); + + rtc->ops = &ds1672_rtc_ops; + rtc->range_max =U32_MAX ; + + err =rtc_register_device (rtc); +if (err) +return err;if (IS_ERR (rtc))return PTR_ERR (rtc);
Signature · 1 line
2.20.1
Alexandre Belloni
maintainerPATCH 2/8 rtc: ds1672: move oscillator handling to .read_time
Return -EINVAL when trying to read an invalid time instead of just probe because this is a useful information for userspace.
--- drivers/rtc/rtc-ds1672.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-)
drivers/rtc/rtc-ds1672.c +16 -13
@@ -29,7 +29,7 @@static int ds1672_get_datetime (struct i2c_client *client,struct rtc_time *tm) {unsigned long time; -unsigned char addr =DS1672_REG_CNT_BASE ; +unsigned char addr =DS1672_REG_CONTROL ;unsigned char buf[4 ];struct i2c_msg msgs[] = {
@@ -41,11 +41,25 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm) {/* read date */ .addr = client->addr, .flags = I2C_M_RD, - .len = 4, + .len = 1, .buf = buf }, }; +/* read control register */ +if ((i2c_transfer (client->adapter, &msgs[0 ],2 )) !=2 ) { +dev_warn (&client->dev,"Unable to read the control register\n" ); +return -EIO ; + } + +if (buf[0 ] &DS1672_REG_CONTROL_EOSC ) { +dev_warn (&client->dev,"Oscillator not enabled. Set time to enable.\n" ); +return -EINVAL ; + } + + addr =DS1672_REG_CNT_BASE ; + msgs[1 ].len =4 ; +/* read date registers */ if ((i2c_transfer (client->adapter, &msgs[0 ],2 )) !=2 ) {dev_err (&client->dev,"%s: read error\n" , __func__);
@@ -154,7 +168,6 @@ static int ds1672_probe(struct i2c_client *client, const struct i2c_device_id *id) {int err =0 ; -u8 control;struct rtc_device *rtc;dev_dbg (&client->dev,"%s\n" , __func__);
@@ -178,16 +191,6 @@ static int ds1672_probe(struct i2c_client *client,i2c_set_clientdata (client, rtc); -/* read control register */ - err =ds1672_get_control (client, &control); -if (err) { -dev_warn (&client->dev,"Unable to read the control register\n" ); - } - -if (control &DS1672_REG_CONTROL_EOSC ) -dev_warn (&client->dev,"Oscillator not enabled. " -"Set time to enable.\n" ); -/* Register sysfs hooks */ err =device_create_file (&client->dev, &dev_attr_control);if (err)
Signature · 1 line
2.20.1
Alexandre Belloni
maintainerPATCH 3/8 rtc: ds1672: remove sysfs debug interface
In reply to Alexandre BelloniRemove the control sysfs file as it is not documented, read only and was only used to provide the oscillator state.
--- drivers/rtc/rtc-ds1672.c | 51 ---------------------------------------- 1 file changed, 51 deletions(-)
drivers/rtc/rtc-ds1672.c +0 -51
@@ -114,51 +114,6 @@ static int ds1672_rtc_set_mmss(struct device *dev, unsigned long secs)return ds1672_set_mmss (to_i2c_client (dev), secs); } -static int ds1672_get_control (struct i2c_client *client,u8 *status) -{ -unsigned char addr =DS1672_REG_CONTROL ; - -struct i2c_msg msgs[] = { - {/* setup read ptr */ - .addr = client->addr, - .len =1 , - .buf = &addr - }, - {/* read control */ - .addr = client->addr, - .flags =I2C_M_RD , - .len =1 , - .buf = status - }, - }; - -/* read control register */ -if ((i2c_transfer (client->adapter, &msgs[0 ],2 )) !=2 ) { -dev_err (&client->dev,"%s: read error\n" , __func__); -return -EIO ; - } - -return 0 ; -} - -/* following are the sysfs callback functions */ -static ssize_t show_control (struct device *dev,struct device_attribute *attr, -char *buf) -{ -struct i2c_client *client =to_i2c_client (dev); -u8 control; -int err; - - err =ds1672_get_control (client, &control); -if (err) -return err; - -return sprintf (buf,"%s\n" , (control &DS1672_REG_CONTROL_EOSC ) - ?"disabled" :"enabled" ); -} - -static DEVICE_ATTR(control, S_IRUGO, show_control, NULL); -static const struct rtc_class_ops ds1672_rtc_ops = { .read_time = ds1672_rtc_read_time, .set_mmss = ds1672_rtc_set_mmss,
@@ -191,12 +146,6 @@ static int ds1672_probe(struct i2c_client *client,i2c_set_clientdata (client, rtc); -/* Register sysfs hooks */ - err =device_create_file (&client->dev, &dev_attr_control); -if (err) -dev_err (&client->dev,"Unable to create sysfs entry: %s\n" , - dev_attr_control.attr.name); -return 0 ; }
Signature · 1 line
2.20.1
Alexandre Belloni
maintainerPATCH 4/8 rtc: ds1672: remove useless indirection
In reply to Alexandre Bellonids1672_get_datetime and ds1672_set_mmss are only used after casting dev to an i2c_client. Remove that useless indirection.
--- drivers/rtc/rtc-ds1672.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-)
drivers/rtc/rtc-ds1672.c +6 -14
@@ -26,8 +26,9 @@* rtc_time -- month 0-11, hour 0-23, yr = calendar year-epoch * Time is set to UTC. */ -static int ds1672_get_datetime (struct i2c_client *client,struct rtc_time *tm) +static int ds1672_read_time (struct device *dev,struct rtc_time *tm) { +struct i2c_client *client =to_i2c_client (dev);unsigned long time;unsigned char addr =DS1672_REG_CONTROL ;unsigned char buf[4 ];
@@ -83,8 +84,9 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm)return 0 ; } -static int ds1672_set_mmss (struct i2c_client *client,unsigned long secs) +static int ds1672_set_mmss (struct device *dev,unsigned long secs) { +struct i2c_client *client =to_i2c_client (dev);int xfer;unsigned char buf[6 ];
@@ -104,19 +106,9 @@ static int ds1672_set_mmss(struct i2c_client *client, unsigned long secs)return 0 ; } -static int ds1672_rtc_read_time (struct device *dev,struct rtc_time *tm) -{ -return ds1672_get_datetime (to_i2c_client (dev), tm); -} - -static int ds1672_rtc_set_mmss (struct device *dev,unsigned long secs) -{ -return ds1672_set_mmss (to_i2c_client (dev), secs); -} -static const struct rtc_class_ops ds1672_rtc_ops = { - .read_time = ds1672_rtc_read_time, - .set_mmss = ds1672_rtc_set_mmss, + .read_time = ds1672_read_time, + .set_mmss = ds1672_set_mmss, }; static int ds1672_probe(struct i2c_client *client,
Signature · 1 line
2.20.1
Alexandre Belloni
maintainerPATCH 5/8 rtc: ds1672: use rtc_time64_to_tm
In reply to Alexandre BelloniUse the 64bit version of rtc_time_to_tm.rtc_time_to_tm.
--- drivers/rtc/rtc-ds1672.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-ds1672.c +1 -1
@@ -74,7 +74,7 @@ static int ds1672_read_time(struct device *dev, struct rtc_time *tm) time = ((unsigned long )buf[3 ] <<24 ) | (buf[2 ] <<16 ) | (buf[1 ] <<8 ) | buf[0 ]; -rtc_time_to_tm (time, tm); +rtc_time64_to_tm (time, tm); dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, " "mday=%d, mon=%d, year=%d, wday=%d\n",
Signature · 1 line
2.20.1
Alexandre Belloni
maintainerPATCH 6/8 rtc: ds1672: use .set_time
In reply to Alexandre BelloniUse .set_time instead of the deprecated .set_mmss.
--- drivers/rtc/rtc-ds1672.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/rtc/rtc-ds1672.c +3 -2
@@ -84,11 +84,12 @@ static int ds1672_read_time(struct device *dev, struct rtc_time *tm)return 0 ; } -static int ds1672_set_mmss (struct device *dev,unsigned long secs) +static int ds1672_set_time (struct device *dev,struct rtc_time *tm) {struct i2c_client *client =to_i2c_client (dev);int xfer;unsigned char buf[6 ]; +unsigned long secs =rtc_tm_to_time64 (tm); buf[0 ] =DS1672_REG_CNT_BASE ; buf[1 ] = secs &0x000000FF ;
@@ -108,7 +109,7 @@ static int ds1672_set_mmss(struct device *dev, unsigned long secs)static const struct rtc_class_ops ds1672_rtc_ops = { .read_time = ds1672_read_time, - .set_mmss = ds1672_set_mmss, + .set_time = ds1672_set_time, }; static int ds1672_probe(struct i2c_client *client,
Signature · 1 line
2.20.1
Alexandre Belloni
maintainerPATCH 7/8 rtc: ds1672: convert to SPDX identifier
In reply to Alexandre BelloniUse SPDX-License-Identifier instead of a verbose license text.
--- drivers/rtc/rtc-ds1672.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/rtc/rtc-ds1672.c +1 -4
@@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * An rtc/i2c driver for the Dallas DS1672 * Copyright 2005-06 Tower Technologies * * Author: Alessandro Zummo <[email protected]> -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. */ #include <linux/i2c.h>
Signature · 1 line
2.20.1
Alexandre Belloni
maintainerPATCH 8/8 rtc: ds1672: switch debug message to %ptR
In reply to Alexandre BelloniUse %ptR to simplify debug message.
--- drivers/rtc/rtc-ds1672.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/rtc/rtc-ds1672.c +1 -4
@@ -73,10 +73,7 @@ static int ds1672_read_time(struct device *dev, struct rtc_time *tm)rtc_time64_to_tm (time, tm); -dev_dbg (&client->dev,"%s: tm is secs=%d, mins=%d, hours=%d, " -"mday=%d, mon=%d, year=%d, wday=%d\n" , - __func__, tm->tm_sec, tm->tm_min, tm->tm_hour, - tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday); +dev_dbg (&client->dev,"%s: tm is %ptR\n" , __func__, tm);return 0 ; }
Signature · 1 line
2.20.1