rtc: Add support for Intersil ISL12057 I2C RTC chip
PATCH RESEND v3 1/1 rtc: Add support for Intersil ISL12057 I2C RTC chip
Intersil ISL12057 I2C RTC chip also supports two alarms. This patch only adds support for basic RTC functionalities (i.e. getting and setting time). Tests have been performed on NETGEAR ReadyNAS 102 w/ startup/shutdown scripts, hwclock, ntpdate and openntpd.
---
This is a resend - just in case the initial mail slept through - as I got no feedback over the past week. I have also Cc'ed additional people.
In order to get at least some initial support for the chip available in mainline kernel (v3.14 will have three users waiting for it: ReadyNAS 102, 104 and 2120), I decided to temporarily remove the alarm and IRQ related code I pushed earlier (see [1] below). If possible, I'd like to iterate on this before Christmas in order not to miss ARM submission cutoff (around -rc5) to push the .dts changes (once the driver is queued for 3.14).
I will submit a patch later to add back Alarm/IRQ support once I get some understanding of how to correctly handle my use case in current RTC subsystem logic.
As asked by Mark, this v3 provides a complete conversion of the driver to use regmap.
Comments welcome!
Cheers,
a+
[1]: http://thread.gmane.org/gmane.linux.drivers.devicetree/46581
Changes since previous v2:
- converted to regmap
Changes since previous v1:
- fixed return values for isl12057_i2c_{read,set}_regs()
- checked associated return paths
Changes since previous v0:
- removed alarm and IRQ related code
- Switched to isl for intersil (no existing driver has any reference to isil, even though this would be the recommended choice)
- Added intersil info in vendor-prefixes.txt file
- Added entry for ISL 12057 in I2C trivial-devices.txt file
- Added mutex protection for non atomic read/write
.../devicetree/bindings/i2c/trivial-devices.txt | 1 + .../devicetree/bindings/vendor-prefixes.txt | 1 + drivers/rtc/Kconfig | 11 + drivers/rtc/Makefile | 1 + drivers/rtc/rtc-isl12057.c | 363 +++++++++++++++++++++ 5 files changed, 377 insertions(+) create mode 100644 drivers/rtc/rtc-isl12057.c
Documentation/devicetree/bindings/i2c/trivial-devices.txt +1 -0
@@ -39,6 +39,7 @@ fsl,sgtl5000 SGTL5000: Ultra Low-Power Audio Codec gmt,g751 G751: Digital Temperature Sensor and Thermal Watchdog with Two-Wire Interface infineon,slb9635tt Infineon SLB9635 (Soft-) I2C TPM (old protocol, max 100khz) infineon,slb9645tt Infineon SLB9645 I2C TPM (new protocol, max 400khz) +isl,isl12057 Intersil ISL12057 I2C RTC Chip maxim,ds1050 5 Bit Programmable, Pulse-Width Modulator maxim,max1237 Low-Power, 4-/12-Channel, 2-Wire Serial, 12-Bit ADCs maxim,max6625 9-Bit/12-Bit Temperature Sensors with I??C-Compatible Serial Interface
Documentation/devicetree/bindings/vendor-prefixes.txt +1 -0
@@ -39,6 +39,7 @@ ibm International Business Machines (IBM) idt Integrated Device Technologies, Inc. img Imagination Technologies Ltd. intercontrol Inter Control Group +isl Intersil lg LG Corporation linux Linux-specific binding lsi LSI Corp. (LSI Logic)
drivers/rtc/Kconfig +11 -0
@@ -304,6 +304,17 @@ config RTC_DRV_ISL12022 This driver can also be built as a module. If so, the module will be called rtc-isl12022. +config RTC_DRV_ISL12057 + depends on I2C + select REGMAP_I2C + tristate "Intersil ISL12057" + help + If you say yes here you get support for the Intersil ISL12057 + I2C RTC chip. + + This driver can also be built as a module. If so, the module + will be called rtc-isl12057. + config RTC_DRV_X1205 tristate "Xicor/Intersil X1205" help
drivers/rtc/Makefile +1 -0
@@ -58,6 +58,7 @@ obj-$(CONFIG_RTC_DRV_HID_SENSOR_TIME) += rtc-hid-sensor-time.o obj-$(CONFIG_RTC_DRV_IMXDI) += rtc-imxdi.o obj-$(CONFIG_RTC_DRV_ISL1208) += rtc-isl1208.o obj-$(CONFIG_RTC_DRV_ISL12022) += rtc-isl12022.o +obj-$(CONFIG_RTC_DRV_ISL12057) += rtc-isl12057.o obj-$(CONFIG_RTC_DRV_JZ4740) += rtc-jz4740.o obj-$(CONFIG_RTC_DRV_LP8788) += rtc-lp8788.o obj-$(CONFIG_RTC_DRV_LPC32XX) += rtc-lpc32xx.o
drivers/rtc/rtc-isl12057.c new file +363 -0
363 lines not on this page · raw message
Signature · 1 line
1.8.4.4
PATCH RESEND v3 1/1 rtc: Add support for Intersil ISL12057 I2C RTC chip
Quoted 6 lines · Arnaud Ebalard
Intersil ISL12057 I2C RTC chip also supports two alarms. This patch only adds support for basic RTC functionalities (i.e. getting and setting time). Tests have been performed on NETGEAR ReadyNAS 102 w/ startup/shutdown scripts, hwclock, ntpdate and openntpd.
Quoted 6 lines
Signed-off-by Arnaud Ebalard <[email protected]>---
This is a resend - just in case the initial mail slept through - as I got no feedback over the past week. I have also Cc'ed additional people.
Looks like your mailer corrupts the patch. You'll have to fix that. More comments below.
[ ... ]
drivers/rtc/rtc-isl12057.c line 45
Quoted 2 lines
drivers/rtc/rtc-isl12057.c new file +2
-0+#define ISL12057_REG_RTC_HR_PM (1<<5)/* AM/PM bit in 12h format */ +#define ISL12057_REG_RTC_HR_MIL (1<<6)/* 24h/12h format */
Use BIT() or@least spaces around '<<'.
Quoted 42 lines
drivers/rtc/rtc-isl12057.c new file +42
-0+#define ISL12057_REG_RTC_DW 0x03/* Day of the Week */ +#define ISL12057_REG_RTC_DT 0x04/* Date */ +#define ISL12057_REG_RTC_MO 0x05/* Month */ +#define ISL12057_REG_RTC_YR 0x06/* Year */ +#define ISL12057_RTC_SEC_LEN 7 + +/* Alarm 1 section */ +#define ISL12057_REG_A1_SC 0x07/* Alarm 1 Seconds */ +#define ISL12057_REG_A1_MN 0x08/* Alarm 1 Minutes */ +#define ISL12057_REG_A1_HR 0x09/* Alarm 1 Hours */ +#define ISL12057_REG_A1_HR_PM (1<<5)/* AM/PM bit in 12h format */ +#define ISL12057_REG_A1_HR_MIL (1<<6)/* 24h/12h format */ +#define ISL12057_REG_A1_DWDT 0x0A/* Alarm 1 Date / Day of the week */ +#define ISL12057_REG_A1_DWDT_B (1<<6)/* DW / DT selection bit */ +#define ISL12057_A1_SEC_LEN 4 + +/* Alarm 2 section */ +#define ISL12057_REG_A2_MN 0x0B/* Alarm 2 Minutes */ +#define ISL12057_REG_A2_HR 0x0C/* Alarm 2 Hours */ +#define ISL12057_REG_A2_DWDT 0x0D/* Alarm 2 Date / Day of the week */ +#define ISL12057_A2_SEC_LEN 3 + +/* Control/Status registers */ +#define ISL12057_REG_INT 0x0E +#define ISL12057_REG_INT_A1IE (1<<0)/* Alarm 1 interrupt enable bit */ +#define ISL12057_REG_INT_A2IE (1<<1)/* Alarm 2 interrupt enable bit */ +#define ISL12057_REG_INT_INTCN (1<<2)/* Interrupt control enable bit */ +#define ISL12057_REG_INT_RS1 (1<<3)/* Freq out control bit 1 */ +#define ISL12057_REG_INT_RS2 (1<<4)/* Freq out control bit 2 */ +#define ISL12057_REG_INT_EOSC (1<<7)/* Oscillator enable bit */ + +#define ISL12057_REG_SR 0x0F +#define ISL12057_REG_SR_A1F (1<<0)/* Alarm 1 interrupt bit */ +#define ISL12057_REG_SR_A2F (1<<1)/* Alarm 2 interrupt bit */ +#define ISL12057_REG_SR_OSF (1<<7)/* Oscillator failure bit */ + +/* Register memory map length */ +#define ISL12057_MEM_MAP_LEN 0x10 + +static struct i2c_driver isl12057_driver; + +struct isl12057_rtc_data {
drivers/rtc/rtc-isl12057.c line 97
Quoted 10 lines
drivers/rtc/rtc-isl12057.c new file +10
-0+struct i2c_client *client; +struct rtc_device *rtc; +struct regmap *regmap; +struct mutex lock; +}; + +static void isl12057_rtc_regs_to_tm (struct rtc_time *tm,u8 *regs) +{ + tm->tm_sec =bcd2bin (regs[ISL12057_REG_RTC_SC ]); + tm->tm_min =bcd2bin (regs[ISL12057_REG_RTC_MN ]);
Extra spaces.
Quoted 65 lines
drivers/rtc/rtc-isl12057.c new file +65
-0+ +if (regs[ISL12057_REG_RTC_HR ] &ISL12057_REG_RTC_HR_MIL ) {/* AM/PM */ + tm->tm_hour =bcd2bin (regs[ISL12057_REG_RTC_HR ] &0x0f ); +if (regs[ISL12057_REG_RTC_HR ] &ISL12057_REG_RTC_HR_PM ) + tm->tm_hour +=12 ; + }else {/* 24 hour mode */ + tm->tm_hour =bcd2bin (regs[ISL12057_REG_RTC_HR ] &0x3f ); + } + + tm->tm_mday =bcd2bin (regs[ISL12057_REG_RTC_DT ]); + tm->tm_wday =bcd2bin (regs[ISL12057_REG_RTC_DW ]) -1 ;/* starts at 1 */ + tm->tm_mon =bcd2bin (regs[ISL12057_REG_RTC_MO ]) -1 ;/* starts at 1 */ + tm->tm_year =bcd2bin (regs[ISL12057_REG_RTC_YR ]) +100 ; +} + +static int isl12057_rtc_tm_to_regs (u8 *regs,struct rtc_time *tm) +{ +/* +* The clock has an 8 bit wide bcd-coded register for the year. +* tm_year is an offset from 1900 and we are interested in the +* 2000-2099 range, so any value less than 100 is invalid. +*/ +if (tm->tm_year <100 ) +return -EINVAL ; + + regs[ISL12057_REG_RTC_SC ] =bin2bcd (tm->tm_sec); + regs[ISL12057_REG_RTC_MN ] =bin2bcd (tm->tm_min); + regs[ISL12057_REG_RTC_HR ] =bin2bcd (tm->tm_hour);/* 24-hour format */ + regs[ISL12057_REG_RTC_DT ] =bin2bcd (tm->tm_mday); + regs[ISL12057_REG_RTC_MO ] =bin2bcd (tm->tm_mon +1 ); + regs[ISL12057_REG_RTC_YR ] =bin2bcd (tm->tm_year -100 ); + regs[ISL12057_REG_RTC_DW ] =bin2bcd (tm->tm_wday +1 ); + +return 0 ; +} + +/* +* Try and match register bits w/ fixed null values to see whether we +* are dealing with an ISL12057. +*/ +static int isl12057_i2c_validate_client (struct regmap *regmap) +{ +u8 regs[ISL12057_MEM_MAP_LEN ]; +u8 mask[ISL12057_MEM_MAP_LEN ] = {0x80 ,0x80 ,0x80 ,0xf8 , +0xc0 ,0x60 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x60 ,0x7c }; +int ret, i; + + ret =regmap_bulk_read (regmap,0 , regs,ISL12057_MEM_MAP_LEN ); +if (ret) +return ret; + +for (i =0 ; i <ISL12057_MEM_MAP_LEN ; ++i) { +if (regs[i] & mask[i])/* check if bits are cleared */ +return -ENODEV ; + } + +return 0 ; +} + +static int isl12057_rtc_read_time (struct device *dev,struct rtc_time *tm) +{ +struct i2c_client *client =to_i2c_client (dev); +struct isl12057_rtc_data *data =i2c_get_clientdata (client);
drivers/rtc/rtc-isl12057.c line 172
Quoted 10 lines
drivers/rtc/rtc-isl12057.c new file +10
-0+u8 regs[ISL12057_RTC_SEC_LEN ]; +int ret; + +mutex_lock (&data->lock); + ret =regmap_bulk_read (data->regmap,ISL12057_REG_RTC_SC , regs, +ISL12057_RTC_SEC_LEN ); +mutex_unlock (&data->lock); + +if (ret) { +dev_err (&client->dev,"%s: RTC read failed\n" , __func__);
'dev' and '&client->dev' should be the same, so why not just use 'dev' ?
Reason for asking is that this is the major use of 'client'. To get 'data', you could use 'dev_set_drvdata' and 'dev_get_drvdata'. Then you could replace
struct i2c_client *client = to_i2c_client(dev); struct isl12057_rtc_data *data = i2c_get_clientdata(client); with struct isl12057_rtc_data *data = dev_get_drvdata(dev);
everywhere.
Quoted 116 lines
drivers/rtc/rtc-isl12057.c new file +116
-0+return ret; + } + +isl12057_rtc_regs_to_tm (tm, regs); + +return rtc_valid_tm (tm); +} + +static int isl12057_rtc_set_time (struct device *dev,struct rtc_time *tm) +{ +struct i2c_client *client =to_i2c_client (dev); +struct isl12057_rtc_data *data =i2c_get_clientdata (client); +u8 regs[ISL12057_RTC_SEC_LEN ]; +int ret; + + ret =isl12057_rtc_tm_to_regs (regs, tm); +if (ret) +return ret; + +mutex_lock (&data->lock); + ret =regmap_bulk_write (data->regmap,ISL12057_REG_RTC_SC , regs, +ISL12057_RTC_SEC_LEN ); +mutex_unlock (&data->lock); + +if (ret) +dev_err (&client->dev,"%s: RTC write failed\n" , __func__); + +return ret; +} + +static int isl12057_rtc_proc (struct device *dev,struct seq_file *seq) +{ +struct i2c_client *const client =to_i2c_client (dev); +struct isl12057_rtc_data *data =i2c_get_clientdata (client); +int reg, ret; + +mutex_lock (&data->lock); + +/* Status register */ + ret =regmap_read (data->regmap,ISL12057_REG_SR , ®); +if (ret) { +dev_err (&client->dev,"%s: reading SR failed\n" , __func__); + goto out; + } + +seq_printf (seq,"status_reg\t:%s%s%s (0x%.2x)\n" , + (reg &ISL12057_REG_SR_OSF ) ?" OSF" :"" , + (reg &ISL12057_REG_SR_A1F ) ?" A1F" :"" , + (reg &ISL12057_REG_SR_A2F ) ?" A2F" :"" , reg); + +/* Control register */ + ret =regmap_read (data->regmap,ISL12057_REG_INT , ®); +if (ret) { +dev_err (&client->dev,"%s: reading INT failed\n" , __func__); + goto out; + } + +seq_printf (seq,"control_reg\t:%s%s%s%s%s%s (0x%.2x)\n" , + (reg &ISL12057_REG_INT_A1IE ) ?" A1IE" :"" , + (reg &ISL12057_REG_INT_A2IE ) ?" A2IE" :"" , + (reg &ISL12057_REG_INT_INTCN ) ?" INTCN" :"" , + (reg &ISL12057_REG_INT_RS1 ) ?" RS1" :"" , + (reg &ISL12057_REG_INT_RS2 ) ?" RS2" :"" , + (reg &ISL12057_REG_INT_EOSC ) ?" EOSC" :"" , reg); + + out: +mutex_unlock (&data->lock); + +return ret; +} + +/* +* Check current RTC status and enable/disable what needs to be. Return 0 if +* everything went ok and a negative value upon error. Note: this function +* is called early during init and hence does need mutex protection. +*/ +static int isl12057_check_rtc_status (struct device *dev,struct regmap *regmap) +{ +int ret; + +/* Enable oscillator if not already running */ + ret =regmap_update_bits (regmap,ISL12057_REG_INT , +ISL12057_REG_INT_EOSC ,0 ); +if (ret <0 ) { +dev_err (dev,"Enable to enable oscillator\n" ); +return ret; + } + +/* Clear oscillator failure bit if needed */ + ret =regmap_update_bits (regmap,ISL12057_REG_SR , +ISL12057_REG_SR_OSF ,0 ); +if (ret <0 ) { +dev_err (dev,"Enable to clear oscillator failure bit\n" ); +return ret; + } + +/* Clear alarm bit if needed */ + ret =regmap_update_bits (regmap,ISL12057_REG_SR , +ISL12057_REG_SR_A1F ,0 ); +if (ret <0 ) { +dev_err (dev,"Enable to clear alarm bit\n" ); +return ret; + } + +return 0 ; +} + +static const struct rtc_class_ops rtc_ops = { + .read_time = isl12057_rtc_read_time, + .set_time = isl12057_rtc_set_time, + .proc = isl12057_rtc_proc, +}; + +static struct regmap_config isl12057_rtc_regmap_config = { + .reg_bits =8 , + .val_bits =8 ,
drivers/rtc/rtc-isl12057.c line 298
Quoted 10 lines
drivers/rtc/rtc-isl12057.c new file +10
-0+}; + +static int isl12057_probe (struct i2c_client *client, +const struct i2c_device_id *id) +{ +struct device *dev = &client->dev; +struct isl12057_rtc_data *data; +struct rtc_device *rtc; +struct regmap *regmap; +int ret =0 ;
Unless I am missing something, this initialization is unnecessary.
drivers/rtc/rtc-isl12057.c line 308
Quoted 10 lines
drivers/rtc/rtc-isl12057.c new file +10
-0+ +if (!i2c_check_functionality (client->adapter,I2C_FUNC_I2C | +I2C_FUNC_SMBUS_BYTE_DATA | +I2C_FUNC_SMBUS_I2C_BLOCK )) +return -ENODEV ; + + regmap =devm_regmap_init_i2c (client, &isl12057_rtc_regmap_config); +if (IS_ERR (regmap)) { + ret =PTR_ERR (regmap); +dev_err (&client->dev,"regmap allocation failed: %d\n" , ret);
Since you assigned dev = &client->dev above, might as well use it.
Quoted 7 lines
drivers/rtc/rtc-isl12057.c new file +7
-0+return ret; + } + + ret =isl12057_i2c_validate_client (regmap); +if (ret) +return ret; +
drivers/rtc/rtc-isl12057.c line 325
Quoted 10 lines
drivers/rtc/rtc-isl12057.c new file +10
-0+ ret =isl12057_check_rtc_status (dev, regmap); +if (ret) +return ret; + + data =devm_kzalloc (dev,sizeof (*data),GFP_KERNEL ); +if (!data) +return -ENOMEM ; + +mutex_init (&data->lock); + data->client = client;
data->client does not appear to be used anywhere.
drivers/rtc/rtc-isl12057.c line 332
Quoted 7 lines
drivers/rtc/rtc-isl12057.c new file +7
-0+ data->regmap = regmap; +i2c_set_clientdata (client, data); + + rtc =devm_rtc_device_register (dev,DRV_NAME , &rtc_ops,THIS_MODULE ); +if (IS_ERR (rtc)) +return PTR_ERR (rtc); + data->rtc = rtc;
data->rtc does not seem to be used anywhere.
drivers/rtc/rtc-isl12057.c line 343
Quoted 11 lines
drivers/rtc/rtc-isl12057.c new file +11
-0+ +return 0 ; +} + +#ifdef CONFIG_OF +static struct of_device_id isl12057_dt_match[] = { + { .compatible ="isl,isl12057" }, + { }, +}; +#endif +
Is this needed ? For i2c devices, struct i2c_device_id should be sufficient.
Quoted 24 lines
drivers/rtc/rtc-isl12057.c new file +20
-0+static const struct i2c_device_id isl12057_id[] = { + {"isl12057" ,0 }, + { } +}; +MODULE_DEVICE_TABLE (i2c, isl12057_id); + +static struct i2c_driver isl12057_driver = { + .driver = { + .name =DRV_NAME , + .owner =THIS_MODULE , + .of_match_table =of_match_ptr (isl12057_dt_match), + }, + .probe = isl12057_probe, + .id_table = isl12057_id, +}; +module_i2c_driver (isl12057_driver); + +MODULE_AUTHOR ("Arnaud EBALARD <[email protected]>" ); +MODULE_DESCRIPTION ("Intersil ISL12057 RTC driver" ); +MODULE_LICENSE ("GPL" );Signature · 1 line
1.8.4.4
PATCH RESEND v3 1/1 rtc: Add support for Intersil ISL12057 I2C RTC chip
Quoted 10 lines · Guenter Roeck
drivers/rtc/rtc-isl12057.c line 342
Quoted 6 lines · Arnaud Ebalard
drivers/rtc/rtc-isl12057.c new file +6
-0+#ifdef CONFIG_OF +static struct of_device_id isl12057_dt_match[] = { + { .compatible ="isl,isl12057" }, + { }, +}; +#endif Is this needed ? For i2c devices, struct
i2c_device_idshould be sufficient.
It is required, it's bad practice to omit the vendor specifier.
Different vendors can and do use the same prefix in their device names
leading to collisions - for example both Wondermedia and Wolfson use wm.
Linux happens to accept unprefixed names but that doesn't mean it's a
good idea.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131216/5f2876f4/attachment.sig>
PATCH RESEND v3 1/1 rtc: Add support for Intersil ISL12057 I2C RTC chip
Quoted 12 lines · Mark Brown
Quoted 10 lines · Guenter Roeck
drivers/rtc/rtc-isl12057.c line 342
Quoted 6 lines · Arnaud Ebalard
drivers/rtc/rtc-isl12057.c new file +6
-0+#ifdef CONFIG_OF +static struct of_device_id isl12057_dt_match[] = { + { .compatible ="isl,isl12057" }, + { }, +}; +#endif Is this needed ? For i2c devices, struct
i2c_device_idshould be sufficient.
Quoted 5 lines
It is required, it's bad practice to omit the vendor specifier. Different vendors can and do use the same prefix in their device names leading to collisions - for example both Wondermedia and Wolfson use wm. Linux happens to accept unprefixed names but that doesn't mean it's a good idea.
Ok, I'll keep that in mind.
Thanks,
Guenter
PATCH RESEND v3 1/1 rtc: Add support for Intersil ISL12057 I2C RTC chip
In reply to Guenter RoeckHi Guenter,
Thanks for the fast feedback! I have handled all your comments and tested the resulting version on my RN102 w/o problems. Will send a v4 in a few minutes.
Can you just look at first comment below?
Quoted 7 lines · Guenter Roeck
Quoted 6 lines
Signed-off-by Arnaud Ebalard <[email protected]>---
This is a resend - just in case the initial mail slept through - as I got no feedback over the past week. I have also Cc'ed additional people.Looks like your mailer corrupts the patch. You'll have to fix that.
If you wonder about the text below the SoB, this is just informational, i.e. to avoid having it in the final commit. Can you be more specific if this is not what you meant, i.e. how the patch is otherwise corrupted?
Quoted 4 lines
drivers/rtc/rtc-isl12057.c line 45
Quoted 2 lines
drivers/rtc/rtc-isl12057.c new file +2
-0+#define ISL12057_REG_RTC_HR_PM (1<<5)/* AM/PM bit in 12h format */ +#define ISL12057_REG_RTC_HR_MIL (1<<6)/* 24h/12h format */ Use
BIT()or at least spaces around '<<'.
Will use BIT().
Quoted 6 lines
drivers/rtc/rtc-isl12057.c line 97
Quoted 4 lines
drivers/rtc/rtc-isl12057.c new file +4
-0+static void isl12057_rtc_regs_to_tm (struct rtc_time *tm,u8 *regs) +{ + tm->tm_sec =bcd2bin (regs[ISL12057_REG_RTC_SC ]); + tm->tm_min =bcd2bin (regs[ISL12057_REG_RTC_MN ]);Extra spaces.
ok.
Quoted 18 lines
Quoted 4 lines
drivers/rtc/rtc-isl12057.c new file +4
-0+static int isl12057_rtc_read_time (struct device *dev,struct rtc_time *tm) +{ +struct i2c_client *client =to_i2c_client (dev); +struct isl12057_rtc_data *data =i2c_get_clientdata (client);drivers/rtc/rtc-isl12057.c line 172
Quoted 10 lines
drivers/rtc/rtc-isl12057.c new file +10
-0+u8 regs[ISL12057_RTC_SEC_LEN ]; +int ret; + +mutex_lock (&data->lock); + ret =regmap_bulk_read (data->regmap,ISL12057_REG_RTC_SC , regs, +ISL12057_RTC_SEC_LEN ); +mutex_unlock (&data->lock); + +if (ret) { +dev_err (&client->dev,"%s: RTC read failed\n" , __func__);'dev' and '
&client->dev' should be the same, so why not just use 'dev' ?
Quoted 7 lines
Reason for asking is that this is the major use of 'client'. To get 'data', you could use '
dev_set_drvdata' and 'dev_get_drvdata'. Then you could replacestruct i2c_client *client = to_i2c_client(dev); struct isl12057_rtc_data *data = i2c_get_clientdata(client); with struct isl12057_rtc_data *data = dev_get_drvdata(dev);everywhere.
Feasible. And It also helps removing a field in my private structure.
Quoted 10 lines
drivers/rtc/rtc-isl12057.c line 298
Quoted 8 lines
drivers/rtc/rtc-isl12057.c new file +8
-0+static int isl12057_probe (struct i2c_client *client, +const struct i2c_device_id *id) +{ +struct device *dev = &client->dev; +struct isl12057_rtc_data *data; +struct rtc_device *rtc; +struct regmap *regmap; +int ret =0 ;Unless I am missing something, this initialization is unnecessary.
You are right.
Quoted 11 lines
drivers/rtc/rtc-isl12057.c line 308
Quoted 9 lines
drivers/rtc/rtc-isl12057.c new file +9
-0+if (!i2c_check_functionality (client->adapter,I2C_FUNC_I2C | +I2C_FUNC_SMBUS_BYTE_DATA | +I2C_FUNC_SMBUS_I2C_BLOCK )) +return -ENODEV ; + + regmap =devm_regmap_init_i2c (client, &isl12057_rtc_regmap_config); +if (IS_ERR (regmap)) { + ret =PTR_ERR (regmap); +dev_err (&client->dev,"regmap allocation failed: %d\n" , ret);Since you assigned dev =
&client->devabove, might as well use it.
Will do.
Quoted 11 lines
Quoted 11 lines
drivers/rtc/rtc-isl12057.c new file +11
-0+return ret; + } + + ret =isl12057_i2c_validate_client (regmap); +if (ret) +return ret; + + ret =isl12057_check_rtc_status (dev, regmap); +if (ret) +return ret; +
Quoted 8 lines
drivers/rtc/rtc-isl12057.c line 325
Quoted 6 lines
drivers/rtc/rtc-isl12057.c new file +6
-0+ data =devm_kzalloc (dev,sizeof (*data),GFP_KERNEL ); +if (!data) +return -ENOMEM ; + +mutex_init (&data->lock); + data->client = client;
data->clientdoes not appear to be used anywhere.
Removed.
Quoted 9 lines
drivers/rtc/rtc-isl12057.c line 332
Quoted 7 lines
drivers/rtc/rtc-isl12057.c new file +7
-0+ data->regmap = regmap; +i2c_set_clientdata (client, data); + + rtc =devm_rtc_device_register (dev,DRV_NAME , &rtc_ops,THIS_MODULE ); +if (IS_ERR (rtc)) +return PTR_ERR (rtc); + data->rtc = rtc;
data->rtcdoes not seem to be used anywhere.
Correct.
Quoted 14 lines
drivers/rtc/rtc-isl12057.c line 343
Quoted 12 lines
drivers/rtc/rtc-isl12057.c new file +11
-0+ +return 0 ; +} + +#ifdef CONFIG_OF +static struct of_device_id isl12057_dt_match[] = { + { .compatible ="isl,isl12057" }, + { }, +}; +#endif +Is this needed ? For i2c devices, struct
i2c_device_idshould be sufficient.
Kept that one as per Mark's comment.
a+
PATCH RESEND v3 1/1 rtc: Add support for Intersil ISL12057 I2C RTC chip
Quoted 16 lines · Arnaud Ebalard
Hi Guenter,
Thanks for the fast feedback! I have handled all your comments and tested the resulting version on my RN102 w/o problems. Will send a v4 in a few minutes.
Can you just look at first comment below?
Quoted 6 lines · Guenter Roeck
Quoted 6 lines
Signed-off-by Arnaud Ebalard <[email protected]>---
This is a resend - just in case the initial mail slept through - as I got no feedback over the past week. I have also Cc'ed additional people.
Quoted 3 lines
Quoted 1 line
Looks like your mailer corrupts the patch. You'll have to fix that.
If you wonder about the text below the SoB, this is just informational,
I know.
Quoted 4 lines
i.e. to avoid having it in the final commit. Can you be more specific if this is not what you meant, i.e. how the patch is otherwise corrupted?
I saved the patch and tried to run it through checkpatch. Doing so, I got a lot of errors with "=3D" or similar, which suggests that the patch went through Outlook, an Exchange server, or a similar e-mail "beautifier" when it was sent.
If the same happens again, I'll send you a log.
Guenter