i2c: m41txx driver for ST i2c RTC chips
PATCH 1/1 i2c: m41txx driver for ST i2c RTC chips
Replace the old m41t00-specific driver with a more generic driver for the ST family of i2c RTC chips. Currently, the m41t00, m41t81, and m41t85 chips are supported but only the m41t00 and m41t85 have been tested.
---
drivers/i2c/chips/Kconfig +10 -9
@@ -102,15 +102,6 @@ config TPS65010 This driver can also be built as a module. If so, the module will be called tps65010. -config SENSORS_M41T00 - tristate "ST M41T00 RTC chip" - depends on I2C && PPC32 - help - If you say yes here you get support for the ST M41T00 RTC chip. - - This driver can also be built as a module. If so, the module - will be called m41t00. - config SENSORS_MAX6875 tristate "Maxim MAX6875 Power supply supervisor" depends on I2C && EXPERIMENTAL
@@ -135,4 +126,14 @@ config RTC_X1205_I2C This driver can also be built as a module. If so, the module will be called x1205. +config RTC_M41TXX_I2C + tristate "ST M41TXX Family of I2C RTC chips" + depends on I2C + help + If you say yes here you get support for the ST M41TXX family + of I2C RTC chips. + + This driver can also be built as a module. If so, the module + will be called m41txx. + endmenu
drivers/i2c/chips/m41t00.c +0 -241
241 lines not on this page · raw message
drivers/i2c/chips/m41txx.c +365 -0
365 lines not on this page · raw message
drivers/i2c/chips/Makefile +1 -1
@@ -6,7 +6,6 @@ obj-$(CONFIG_SENSORS_DS1337) += ds1337.o obj-$(CONFIG_SENSORS_DS1374) += ds1374.o obj-$(CONFIG_SENSORS_EEPROM) += eeprom.o obj-$(CONFIG_SENSORS_MAX6875) += max6875.o -obj-$(CONFIG_SENSORS_M41T00) += m41t00.o obj-$(CONFIG_SENSORS_PCA9539) += pca9539.o obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o
@@ -14,6 +13,7 @@ obj-$(CONFIG_SENSORS_RTC8564) += rtc8564 obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o obj-$(CONFIG_TPS65010) += tps65010.o obj-$(CONFIG_RTC_X1205_I2C) += x1205.o +obj-$(CONFIG_RTC_M41TXX_I2C) += m41txx.o ifeq ($(CONFIG_I2C_DEBUG_CHIP),y) EXTRA_CFLAGS += -DDEBUG
include/linux/i2c-id.h +1 -1
@@ -79,7 +79,7 @@#define I2C_DRIVERID_SAA7114 49/* video decoder */ #define I2C_DRIVERID_ZR36120 50/* Zoran 36120 video encoder */ #define I2C_DRIVERID_24LC32A 51/* Microchip 24LC32A 32k EEPROM */ -#define I2C_DRIVERID_STM41T00 52/* real time clock */ +#define I2C_DRIVERID_STM41TXX 52/* real time clock */ #define I2C_DRIVERID_UDA1342 53/* UDA1342 audio codec */ #define I2C_DRIVERID_ADV7170 54/* video encoder */ #define I2C_DRIVERID_RADEON 55/* I2C bus on Radeon boards */
include/linux/m41txx.h +47 -0
47 lines not on this page · raw message
PATCH 1/1 i2c: m41txx driver for ST i2c RTC chips
Hello,
Please note that you will have to fix some files in ./arch/powerpc/configs/ and ./arch/ppc/configs/ too.( they mention CONFIG_SENSORS_M41T00) And of course /arch/ppc/platforms/katana.c I think it will need the platform stuff so it can connect to this platform driver.
I'm not very sure what will happen when some users dont have this chip in their platform? Ideally they should just force the driver to specific addr. As far I can judge this cannot be done (I looked to _probe function) Maybe there can be some workaround so they can force the parameters somehow? Please can you throw some light on this?
We will need certainly a Documentation/i2c/chips/m41txx to document how this issue can be solved.
I tried to review the driver and seems OK to me.
Thanks,
regards
Rudolf
Quoted 456 lines
diff -Nurp
linux-2.6.16-rc3-mm1/drivers/i2c/chips/m41txx.clinux-2.6.16-rc3-mm1-m41txx/drivers/i2c/chips/m41txx.cdrivers/i2c/chips/m41txx.c +365
-0@@ -0,0 +1,365 @@ +/* +* I2C client/driver for the ST M41Txx family of i2c rtc chips. +* +* Author: Mark A. Greer <mgreer at mvista.com> +* +* 2005 (c) MontaVista Software, Inc. This file is licensed under +* the terms of the GNU General Public License version 2. This program +* is licensed "as is" without any warranty of any kind, whether express +* or implied. +*/ +/* +* This i2c client/driver wedges between the drivers/char/genrtc.c RTC +* interface and the SMBus interface of the i2c subsystem. +*/ + +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/interrupt.h> +#include <linux/i2c.h> +#include <linux/rtc.h> +#include <linux/m41txx.h> +#include <linux/bcd.h> +#include <linux/workqueue.h> +#include <linux/platform_device.h> + +#include <asm/time.h> +#include <asm/rtc.h> + +static struct work_struct set_rtc_time_task; + +static struct i2c_driver m41txx_driver; +static struct i2c_client *save_client; + +static unsigned short ignore[] = {I2C_CLIENT_END }; +static unsigned short normal_addr[] = {0 ,I2C_CLIENT_END }; + +static struct i2c_client_address_data addr_data = { + .normal_i2c = normal_addr, + .probe = ignore, + .ignore = ignore, +}; + +struct m41txx_chip_info { +u16 type; +u16 read_limit; +u8 sec;/* Offsets for chip regs */ +u8 min; +u8 hour; +u8 day; +u8 mon; +u8 year; +u8 alarm_mon; +u8 alarm_hour; +u8 sqw; +u32 sqw_freq; +}; + +static struct m41txx_chip_info m41txx_chip_info_tbl[] = { + {M41TXX_TYPE_M41T00 ,5 ,0 ,1 ,2 ,4 ,5 ,6 ,0 ,0 ,0 ,0 }, + {M41TXX_TYPE_M41T81 ,1 ,1 ,2 ,3 ,5 ,6 ,7 ,0xa ,0xc ,0x13 ,0 }, + {M41TXX_TYPE_M41T85 ,1 ,1 ,2 ,3 ,5 ,6 ,7 ,0xa ,0xc ,0x13 ,0 }, +}; +static struct m41txx_chip_info *m41txx_chip; + +unsigned long +m41txx_get_rtc_time (void ) +{ +s32 sec, min, hour, day, mon, year; +s32 sec1, min1, hour1, day1, mon1, year1; +u16 reads =0 ; +u8 buf[8 ], msgbuf[1 ] = {0 };/* offset into rtc's regs */ +struct i2c_msg msgs[] = { + { save_client->addr,0 ,1 , msgbuf }, + { save_client->addr,I2C_M_RD ,8 , buf } + }; + + sec = min = hour = day = mon = year =0 ; + +do { +if (i2c_transfer (save_client->adapter, msgs,2 ) <0 ) + goto read_err; + + sec1 = sec; + min1 = min; + hour1 = hour; + day1 = day; + mon1 = mon; + year1 = year; + + sec = buf[m41txx_chip->sec] &0x7f ; + min = buf[m41txx_chip->min] &0x7f ; + hour = buf[m41txx_chip->hour] &0x3f ; + day = buf[m41txx_chip->day] &0x3f ; + mon = buf[m41txx_chip->mon] &0x1f ; + year = buf[m41txx_chip->year] &0xff ; + }while ((++reads < m41txx_chip->read_limit) && ((sec != sec1) + || (min != min1) || (hour != hour1) || (day != day1) + || (mon != mon1) || (year != year1))); + +if ((m41txx_chip->read_limit >1 ) && ((sec != sec1) || (min != min1) + || (hour != hour1) || (day != day1) || (mon != mon1) + || (year != year1))) + goto read_err; + + sec =BCD2BIN (sec); + min =BCD2BIN (min); + hour =BCD2BIN (hour); + day =BCD2BIN (day); + mon =BCD2BIN (mon); + year =BCD2BIN (year); + + year +=1900 ; +if (year <1970 ) + year +=100 ; + +return mktime (year, mon, day, hour, min, sec); + +read_err: +dev_err (&save_client->dev,"m41txx_get_rtc_time: Read error\n" ); +return 0 ; +} + +static void +m41txx_set (void *arg) +{ +struct rtc_time tm; +int nowtime = *(int *)arg; +s32 sec, min, hour, day, mon, year; +u8 wbuf[9 ], *buf = &wbuf[1 ], msgbuf[1 ] = {0 }; +struct i2c_msg msgs[] = { + { save_client->addr,0 ,1 , msgbuf }, + { save_client->addr,I2C_M_RD ,8 , buf } + }; + +to_tm (nowtime, &tm); + tm.tm_year = (tm.tm_year -1900 ) %100 ; + + sec =BIN2BCD (tm.tm_sec); + min =BIN2BCD (tm.tm_min); + hour =BIN2BCD (tm.tm_hour); + day =BIN2BCD (tm.tm_mday); + mon =BIN2BCD (tm.tm_mon); + year =BIN2BCD (tm.tm_year); + +/* Read reg values into buf[0..7]/wbuf[1..8] */ +if (i2c_transfer (save_client->adapter, msgs,2 ) <0 ) { +dev_err (&save_client->dev,"m41txx_set: Read error\n" ); +return ; + } + + wbuf[0 ] =0 ;/* offset into rtc's regs */ + buf[m41txx_chip->sec] = (buf[m41txx_chip->sec] & ~0x7f ) | (sec &0x7f ); + buf[m41txx_chip->min] = (buf[m41txx_chip->min] & ~0x7f ) | (min &0x7f ); + buf[m41txx_chip->hour] = (buf[m41txx_chip->hour]& ~0x3f ) | (hour&0x3f ); + buf[m41txx_chip->day] = (buf[m41txx_chip->day] & ~0x3f ) | (day &0x3f ); + buf[m41txx_chip->mon] = (buf[m41txx_chip->mon] & ~0x1f ) | (mon &0x1f ); + +if (i2c_master_send (save_client, wbuf,9 ) <0 ) +dev_err (&save_client->dev,"m41txx_set: Write error\n" ); +} + +static u32 new_time; + +int +m41txx_set_rtc_time (unsigned long nowtime) +{ + new_time = nowtime; + +if (in_interrupt ()) +schedule_work (&set_rtc_time_task); +else +m41txx_set ((void *)&new_time); +return 0 ; +} + +/* +***************************************************************************** +* +* platform_data Driver Interface +* +***************************************************************************** +*/ +static int __init +m41txx_platform_probe (struct platform_device *pdev) +{ +struct m41txx_platform_data *pdata; +int i; + +if (pdev && (pdata = pdev->dev.platform_data)) { + normal_addr[0 ] = pdata->i2c_addr; + +for (i=0 ; i<ARRAY_SIZE (m41txx_chip_info_tbl); i++) +if (m41txx_chip_info_tbl[i].type = pdata->type) { + m41txx_chip = &m41txx_chip_info_tbl[i]; + m41txx_chip->sqw_freq = pdata->sqw_freq; +return 0 ; + } + } +return -ENODEV ; +} + +static int __exit +m41txx_platform_remove (struct platform_device *pdev) +{ +return 0 ; +} + +static struct platform_driver m41txx_platform_driver = { + .probe = m41txx_platform_probe, + .remove = m41txx_platform_remove, + .driver = { + .owner =THIS_MODULE , + .name =M41TXX_DRV_NAME , + }, +}; + +/* +***************************************************************************** +* +* Driver Interface +* +***************************************************************************** +*/ +static int +m41txx_probe (struct i2c_adapter *adap,int addr,int kind) +{ +struct i2c_client *client; +int rc; +u8 rbuf[1 ], wbuf[2 ], msgbuf[1 ] = {0 };/* offset into rtc's regs */ +struct i2c_msg msgs[] = { + {0 ,0 ,1 , msgbuf }, + {0 ,I2C_M_RD ,1 , rbuf } + }; + + client =kzalloc (sizeof (struct i2c_client ),GFP_KERNEL ); +if (!client) +return -ENOMEM ; + +strlcpy (client->name, m41txx_driver.driver.name,I2C_NAME_SIZE ); + client->addr = addr; + client->adapter = adap; + client->driver = &m41txx_driver; + +if ((rc =i2c_attach_client (client)) !=0 ) + goto attach_err; + + msgs[0 ].addr = addr; + msgs[1 ].addr = addr; + +if (m41txx_chip->type !=M41TXX_TYPE_M41T00 ) { +/* If asked, set SQW frequency & enable */ +if (m41txx_chip->sqw_freq) { + msgbuf[0 ] = m41txx_chip->alarm_mon; +if ((rc =i2c_transfer (client->adapter, msgs,2 )) <0 ) + goto sqw_err; + + wbuf[0 ] = m41txx_chip->alarm_mon; + wbuf[1 ] = rbuf[0 ] & ~0x40 ; +if ((rc =i2c_master_send (client, wbuf,2 )) <0 ) + goto sqw_err; + + wbuf[0 ] = m41txx_chip->sqw; + wbuf[1 ] = m41txx_chip->sqw_freq; +if ((rc =i2c_master_send (client, wbuf,2 )) <0 ) + goto sqw_err; + + wbuf[0 ] = m41txx_chip->alarm_mon; + wbuf[1 ] = rbuf[0 ] |0x40 ; +if ((rc =i2c_master_send (client, wbuf,2 )) <0 ) + goto sqw_err; + } + +/* Make sure HT (Halt Update) bit is cleared */ + msgbuf[0 ] = m41txx_chip->alarm_hour; +if ((rc =i2c_transfer (client->adapter, msgs,2 )) <0 ) + goto ht_err; + +if (rbuf[0 ] &0x40 ) { + wbuf[0 ] = m41txx_chip->alarm_hour; + wbuf[1 ] = rbuf[0 ] & ~0x40 ; +if ((rc =i2c_master_send (client, wbuf,2 )) <0 ) + goto ht_err; + } + } + +/* Make sure ST (stop) bit is cleared */ + msgbuf[0 ] = m41txx_chip->sec; +if ((rc =i2c_transfer (client->adapter, msgs,2 )) <0 ) + goto st_err; + +if (rbuf[0 ] &0x80 ) { + wbuf[0 ] = m41txx_chip->sec; + wbuf[1 ] = rbuf[0 ] & ~0x80 ; +if ((rc =i2c_master_send (client, wbuf,2 )) <0 ) + goto st_err; + } + +INIT_WORK (&set_rtc_time_task, &m41txx_set, &new_time); + save_client = client; +return 0 ; + +st_err: +dev_err (&client->dev,"m41txx_probe: Can't clear ST bit\n" ); + goto attach_err; +ht_err: +dev_err (&client->dev,"m41txx_probe: Can't clear HT bit\n" ); + goto attach_err; +sqw_err: +dev_err (&client->dev,"m41txx_probe: Can't set SQW Frequency\n" ); +attach_err: +kfree (client); +return rc; +} + +static int +m41txx_attach (struct i2c_adapter *adap) +{ +return i2c_probe (adap, &addr_data, m41txx_probe); +} + +static int +m41txx_detach (struct i2c_client *client) +{ +int rc; + +if ((rc =i2c_detach_client (client)) =0 ) { +kfree (client); +flush_scheduled_work (); + } +return rc; +} + +static struct i2c_driver m41txx_driver = { + .driver = { + .owner =THIS_MODULE , + .name =M41TXX_DRV_NAME , + }, + .id =I2C_DRIVERID_STM41TXX , + .attach_adapter = m41txx_attach, + .detach_client = m41txx_detach, +}; + +static int __init +m41txx_init (void ) +{ +int rc; + +if (!(rc =platform_driver_register (&m41txx_platform_driver))) + rc =i2c_add_driver (&m41txx_driver); +return rc; +} + +static void __exit +m41txx_exit (void ) +{ +i2c_del_driver (&m41txx_driver); +platform_driver_unregister (&m41txx_platform_driver); +} + +module_init (m41txx_init); +module_exit (m41txx_exit); + +MODULE_AUTHOR ("Mark A. Greer <mgreer at mvista.com>" ); +MODULE_DESCRIPTION ("ST Microelectronics M41TXX RTC I2C Client Driver" ); +MODULE_LICENSE ("GPL" );diff -Nurp linux-2.6.16-rc3-mm1/drivers/i2c/chips/Makefile linux-2.6.16-rc3-mm1-m41txx/drivers/i2c/chips/Makefile
drivers/i2c/chips/Makefile +1
-1@@ -6,7 +6,6 @@ obj-$(CONFIG_SENSORS_DS1337) += ds1337.o obj-$(CONFIG_SENSORS_DS1374) += ds1374.o obj-$(CONFIG_SENSORS_EEPROM) += eeprom.o obj-$(CONFIG_SENSORS_MAX6875) += max6875.o -obj-$(CONFIG_SENSORS_M41T00) += m41t00.o obj-$(CONFIG_SENSORS_PCA9539) += pca9539.o obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o@@ -14,6 +13,7 @@ obj-$(CONFIG_SENSORS_RTC8564) += rtc8564 obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o obj-$(CONFIG_TPS65010) += tps65010.o obj-$(CONFIG_RTC_X1205_I2C) += x1205.o +obj-$(CONFIG_RTC_M41TXX_I2C) += m41txx.o ifeq ($(CONFIG_I2C_DEBUG_CHIP),y) EXTRA_CFLAGS += -DDEBUGdiff -Nurp
linux-2.6.16-rc3-mm1/include/linux/i2c-id.hlinux-2.6.16-rc3-mm1-m41txx/include/linux/i2c-id.hinclude/linux/i2c-id.h +1
-1@@ -79,7 +79,7 @@#define I2C_DRIVERID_SAA7114 49/* video decoder */ #define I2C_DRIVERID_ZR36120 50/* Zoran 36120 video encoder */ #define I2C_DRIVERID_24LC32A 51/* Microchip 24LC32A 32k EEPROM */ -#define I2C_DRIVERID_STM41T00 52/* real time clock */ +#define I2C_DRIVERID_STM41TXX 52/* real time clock */ #define I2C_DRIVERID_UDA1342 53/* UDA1342 audio codec */ #define I2C_DRIVERID_ADV7170 54/* video encoder */ #define I2C_DRIVERID_RADEON 55/* I2C bus on Radeon boards */ diff -Nurp
linux-2.6.16-rc3-mm1/include/linux/m41txx.hlinux-2.6.16-rc3-mm1-m41txx/include/linux/m41txx.hinclude/linux/m41txx.h +47
-0@@ -0,0 +1,47 @@ +/* +* Definitions for the ST M41Txx family of i2c rtc chips. +* +* Author: Mark A. Greer <mgreer at mvista.com> +* +* 2005 (c) MontaVista Software, Inc. This file is licensed under +* the terms of the GNU General Public License version 2. This program +* is licensed "as is" without any warranty of any kind, whether express +* or implied. +*/ + +#ifndef _M41TXX_H +#define _M41TXX_H + +#define M41TXX_DRV_NAME "m41txx rtc" +#define M41TXX_I2C_ADDR 0x68 + +#define M41TXX_TYPE_M41T00 0 +#define M41TXX_TYPE_M41T81 81 +#define M41TXX_TYPE_M41T85 85 + +struct m41txx_platform_data { +u16 type; +u16 i2c_addr; +u32 sqw_freq; +}; + +/* SQW output disabled, this is default value by power on*/ +#define SQW_FREQ_DISABLE (0) + +#define SQW_FREQ_32KHZ (1<<4)/* 32.768 KHz */ +#define SQW_FREQ_8KHZ (2<<4)/* 8.192 KHz */ +#define SQW_FREQ_4KHZ (3<<4)/* 4.096 KHz */ +#define SQW_FREQ_2KHZ (4<<4)/* 2.048 KHz */ +#define SQW_FREQ_1KHZ (5<<4)/* 1.024 KHz */ +#define SQW_FREQ_512HZ (6<<4)/* 512 Hz */ +#define SQW_FREQ_256HZ (7<<4)/* 256 Hz */ +#define SQW_FREQ_128HZ (8<<4)/* 128 Hz */ +#define SQW_FREQ_64HZ (9<<4)/* 64 Hz */ +#define SQW_FREQ_32HZ (10<<4)/* 32 Hz */ +#define SQW_FREQ_16HZ (11<<4)/* 16 Hz */ +#define SQW_FREQ_8HZ (12<<4)/* 8 Hz */ +#define SQW_FREQ_4HZ (13<<4)/* 4 Hz */ +#define SQW_FREQ_2HZ (14<<4)/* 2 Hz */ +#define SQW_FREQ_1HZ (15<<4)/* 1 Hz */ + +#endif /* _M41TXX_H */ _______________________________________________
lm-sensors mailing list
lm-sensors at lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
PATCH 1/1 i2c: m41txx driver for ST i2c RTC chips
In reply to Mark A. GreerHi Rudolf,
Quoted 5 lines · Rudolf Marek
Hello,
Please note that you will have to fix some files in
./arch/powerpc/configs/and./arch/ppc/configs/too.( they mentionCONFIG_SENSORS_M41T00) And of course /arch/ppc/platforms/katana.c I think it will need the platform stuff so it can connect to this platform driver.
Yes, but that's a separate patch that doesn't go to lm-sensors. See
http://lists.lm-sensors.org/pipermail/lm-sensors/2005-December/014727.html
to get an idea what that patch would look like.
Quoted 1 line
I'm not very sure what will happen when some users dont have this chip in their platform?
Then they will either not have it selected and it won't be an issue or it will silently do nothing and it won't be an issue.
Quoted 4 lines
Ideally they should just force the driver to specific addr. As far I can judge this cannot be done (I looked to
_probefunction) Maybe there can be some workaround so they can force the parameters somehow? Please can you throw some light on this?
We will need certainly aDocumentation/i2c/chips/m41txxto document how this issue can be solved.
I presume you mean the i2c addr. If that's correct, then that address is passed into the driver via platform_data. Look at include/linux/m41txx.h then search for 'i2c_addr' in the driver.
Quoted 1 line
I tried to review the driver and seems OK to me.
Thanks for taking the time to look at it.
Mark
PATCH 1/1 i2c: m41txx driver for ST i2c RTC chips
In reply to Mark A. GreerHello again,
Quoted 1 line
to get an idea what that patch would look like.
Good that is what I wanted to see :)
Quoted 3 lines
I presume you mean the i2c addr. If that's correct, then that address is passed into the driver via
platform_data. Look atinclude/linux/m41txx.hthen search for 'i2c_addr' in the driver.
Yep I done that. This assumes that people using this driver must fix it to support it through the platform data...
Quoted 4 lines
Quoted 1 line
I tried to review the driver and seems OK to me.
Thanks for taking the time to look at it.
Lets wait when Jean will have some little time to look into it.
Regards
Rudolf
PATCH 1/1 i2c: m41txx driver for ST i2c RTC chips
In reply to Mark A. GreerHi Mark, Rudolf,
First of all, Mark, I'm very sorry I did not reply earlier, as you're always doing such a good job. I'm just too busy with many other stuff :( and I need to take some time for myself from times to times too.
I see that Rudolf has been reviewing your code, thanks Rudolf.
Quoted 3 lines
Quoted 1 line
Thanks for taking the time to look at it.
Lets wait when Jean will have some little time to look into it.
I won't have the time to review it completely, but I'd just have one question/suggestion: Mark, why did you rename the driver from m41t00 to m41txx? I understand that the driver now supports more than one device, but almost all our i2c and hwmon drivers so, and we still usually stick to the name of the first supported device. This works just fine.
The problem I see with the renaming is that it makes reviewing the changes much more difficult. As a matter of fact, I did not review your patch, in part for that reason :( Then it can confuse some source control systems (such as quilt, which I use) or at least make them less convenient to use.
It'll also make things harder for the users (they may need to update some configuration files, which won't be compatible between old and new kernels.) Last, I doubt that your driver actually covers all 100 devices from m41t00 to m41t99 ;) and if any of these chips isn't compatible enough to be supported by your driver, you'll be in trouble to find a name for the new driver...
So I'd suggest that you do not rename the driver, it it's not too late.
Thanks,
--
Jean Delvare
PATCH 1/1 i2c: m41txx driver for ST i2c RTC chips
In reply to Mark A. GreerHi Jean.
Quoted 6 lines · Jean Delvare
Hi Mark, Rudolf,
First of all, Mark, I'm very sorry I did not reply earlier, as you're always doing such a good job. I'm just too busy with many other stuff :( and I need to take some time for myself from times to times too.
No problem.
Quoted 18 lines
I see that Rudolf has been reviewing your code, thanks Rudolf.
Quoted 3 lines
Quoted 1 line
Thanks for taking the time to look at it.
Lets wait when Jean will have some little time to look into it.
I won't have the time to review it completely, but I'd just have one question/suggestion: Mark, why did you rename the driver from m41t00 to m41txx? I understand that the driver now supports more than one device, but almost all our i2c and hwmon drivers so, and we still usually stick to the name of the first supported device. This works just fine.
The problem I see with the renaming is that it makes reviewing the changes much more difficult. As a matter of fact, I did not review your patch, in part for that reason :( Then it can confuse some source control systems (such as quilt, which I use) or at least make them less convenient to use.
Quoted 8 lines
It'll also make things harder for the users (they may need to update some configuration files, which won't be compatible between old and new kernels.) Last, I doubt that your driver actually covers all 100 devices from m41t00 to m41t99 ;) and if any of these chips isn't compatible enough to be supported by your driver, you'll be in trouble to find a name for the new driver...
So I'd suggest that you do not rename the driver, it it's not too late.
Okay, that makes sense. I'll change the name back to m41t00 and submit that patch in the next day or so.
Mark
PATCH 1/1 i2c: m41txx driver for ST i2c RTC chips
In reply to Mark A. GreerQuoted 8 lines · Mark A. Greer
Hi Jean.
Quoted 2 lines · Jean Delvare
So I'd suggest that you do not rename the driver, it it's not too late.
Okay, that makes sense. I'll change the name back to m41t00 and submit that patch in the next day or so.
Hi Jean, et. al.,
It looks like in the 2.6.16-rc6-mm1 tree I should really be putting the m41t00 driver into drivers/rtc but I need to check if it will work okay for ppc. In the meantime, here is a patch that keeps it in drivers/i2c/chips. I hope it is easier to review and is acceptable.
Thanks for your time (I know you're busy),
Mark
--------------------------------------------------------------------------
Replace the old m41t00-specific driver with a more generic driver for the ST family of i2c RTC chips. Currently, the m41t00, m41t81, and m41t85 chips are supported but only the m41t00 and m41t85 have been tested.
---
drivers/i2c/chips/Kconfig | 9 - drivers/i2c/chips/Makefile | 2 drivers/i2c/chips/m41t00.c | 322 +++++++++++++++++++++++++++++++-------------- include/linux/m41t00.h | 47 ++++++ 4 files changed, 276 insertions(+), 104 deletions(-)
---
drivers/i2c/chips/Kconfig +5 -4
@@ -93,11 +93,12 @@ config TPS65010 This driver can also be built as a module. If so, the module will be called tps65010. -config SENSORS_M41T00 - tristate "ST M41T00 RTC chip" - depends on I2C && PPC32 +config RTC_M41T00_I2C + tristate "ST M41T00 Family of I2C RTC chips" + depends on I2C help - If you say yes here you get support for the ST M41T00 RTC chip. + If you say yes here you get support for the ST M41T00, M41T81, + and M41T85 (and possibly other) I2C RTC chips. This driver can also be built as a module. If so, the module will be called m41t00.
drivers/i2c/chips/m41t00.c +223 -99
433 lines not on this page · raw message
drivers/i2c/chips/Makefile +1 -1
@@ -6,12 +6,12 @@ obj-$(CONFIG_SENSORS_DS1337) += ds1337.o obj-$(CONFIG_SENSORS_DS1374) += ds1374.o obj-$(CONFIG_SENSORS_EEPROM) += eeprom.o obj-$(CONFIG_SENSORS_MAX6875) += max6875.o -obj-$(CONFIG_SENSORS_M41T00) += m41t00.o obj-$(CONFIG_SENSORS_PCA9539) += pca9539.o obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o obj-$(CONFIG_TPS65010) += tps65010.o +obj-$(CONFIG_RTC_M41T00_I2C) += m41t00.o ifeq ($(CONFIG_I2C_DEBUG_CHIP),y) EXTRA_CFLAGS += -DDEBUG
include/linux/m41t00.h +47 -0
47 lines not on this page · raw message
PATCH 1/1 i2c: m41txx driver for ST i2c RTC chips
In reply to Mark A. GreerHi Mark,
Quoted 9 lines
Quoted 4 lines
Quoted 1 line
So I'd suggest that you do not rename the driver, it it's not too late.
Okay, that makes sense. I'll change the name back to m41t00 and submit that patch in the next day or so.
It looks like in the 2.6.16-rc6-mm1 tree I should really be putting the m41t00 driver into
drivers/rtcbut I need to check if it will work okay for ppc. In the meantime, here is a patch that keeps it indrivers/i2c/chips. I hope it is easier to review and is acceptable.
Yes that's the right way to do it, I think.
Quoted 4 lines
Replace the old m41t00-specific driver with a more generic driver for the ST family of i2c RTC chips. Currently, the m41t00, m41t81, and m41t85 chips are supported but only the m41t00 and m41t85 have been tested.
I still have a problem with your patch (sorry). It's really doing to many things at once. Namely, it adds support for new chips, converts from tasklet to workqueue, cleans up a few things (e.g. BIN2BCD instead of BIN_TO_BCD, which is a good move), and also includes some whitespace changes (some of which is NOT OK, please don't attempt to align equal signs with spaces in regular code!)
I would also object to the configuration symbol change. I think it'll be less confusing if you change it when moving the driver to the RTC subsystem.
So I'd like you to split this large patch in shorter chunks. The most important and urgent one is obviously the tasklet/workqueue replacement, as it fixes a bug in -mm (and possibly mainline too). Then maybe one patch with all the good cleanups, and a third one adding support for the new chips?
I know it means more work for you and I'm sorry about that, but it's also the only way for me to give proper review to all the changes.
Thanks,
Signature · 1 line
Jean Delvare
PATCH 1/1 i2c: m41txx driver for ST i2c RTC chips
In reply to Mark A. GreerQuoted 19 lines · Jean Delvare
Hi Mark,
Quoted 9 lines
Quoted 4 lines
Quoted 1 line
So I'd suggest that you do not rename the driver, it it's not too late.
Okay, that makes sense. I'll change the name back to m41t00 and submit that patch in the next day or so.
It looks like in the 2.6.16-rc6-mm1 tree I should really be putting the m41t00 driver into
drivers/rtcbut I need to check if it will work okay for ppc. In the meantime, here is a patch that keeps it indrivers/i2c/chips. I hope it is easier to review and is acceptable.Yes that's the right way to do it, I think.
Quoted 4 lines
Replace the old m41t00-specific driver with a more generic driver for the ST family of i2c RTC chips. Currently, the m41t00, m41t81, and m41t85 chips are supported but only the m41t00 and m41t85 have been tested.
Quoted 6 lines
I still have a problem with your patch (sorry). It's really doing to many things at once. Namely, it adds support for new chips, converts from tasklet to workqueue, cleans up a few things (e.g. BIN2BCD instead of
BIN_TO_BCD, which is a good move), and also includes some whitespace changes (some of which is NOT OK, please don't attempt to align equal signs with spaces in regular code!)
You mean things like the following?
sec = buf[m41t00_chip->sec] & 0x7f; min = buf[m41t00_chip->min] & 0x7f; hour = buf[m41t00_chip->hour] & 0x3f;
I just want to make sure I change the right code.
Quoted 3 lines
I would also object to the configuration symbol change. I think it'll be less confusing if you change it when moving the driver to the RTC subsystem.
Okay.
Quoted 5 lines
So I'd like you to split this large patch in shorter chunks. The most important and urgent one is obviously the tasklet/workqueue replacement, as it fixes a bug in -mm (and possibly mainline too). Then maybe one patch with all the good cleanups, and a third one adding support for the new chips?
Makes sense.
Quoted 2 lines
I know it means more work for you and I'm sorry about that, but it's also the only way for me to give proper review to all the changes.
No problem, Jean. Thanks for the comments. I'll post the new patches asap.
Mark
PATCH 1/3 rtc: m41t00 driver should use workqueue instead of tasklet
The m41t00 i2c/rtc driver currently uses a tasklet to schedule interrupt-level writes to the rtc. This patch causes the driver to use a workqueue instead.
---
m41t00.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-)
---
drivers/i2c/chips/m41t00.c +7 -6
@@ -25,6 +25,7 @@#include <linux/rtc.h> #include <linux/bcd.h> #include <linux/mutex.h> +#include <linux/workqueue.h> #include <asm/time.h> #include <asm/rtc.h>
@@ -32,6 +33,7 @@#define M41T00_DRV_NAME "m41t00"static DEFINE_MUTEX (m41t00_mutex); +static struct work_struct set_rtc_time_task;static struct i2c_driver m41t00_driver;static struct i2c_client *save_client;
@@ -111,7 +113,7 @@ m41t00_get_rtc_time(void) }static void -m41t00_set_tlet (ulong arg) +m41t00_set (void *arg) {struct rtc_time tm;ulong nowtime = *(ulong *)arg;
@@ -147,17 +149,15 @@ m41t00_set_tlet(ulong arg)static ulong new_time; -DECLARE_TASKLET_DISABLED (m41t00_tasklet, m41t00_set_tlet, (ulong)&new_time); -int m41t00_set_rtc_time (ulong nowtime) { new_time = nowtime;if (in_interrupt ()) -tasklet_schedule (&m41t00_tasklet); +schedule_work (&set_rtc_time_task);else -m41t00_set_tlet ((ulong)&new_time); +m41t00_set ((void *)&new_time);return 0 ; }
@@ -189,6 +189,7 @@ m41t00_probe(struct i2c_adapter *adap, ireturn rc; } +INIT_WORK (&set_rtc_time_task, &m41t00_set, &new_time); save_client = client;return 0 ; }
@@ -206,7 +207,7 @@ m41t00_detach(struct i2c_client *client)if ((rc =i2c_detach_client (client)) ==0 ) {kfree (client); -tasklet_kill (&m41t00_tasklet); +flush_scheduled_work (); }return rc; }
Re: [PATCH 2.6.16-mm1 1/3] rtc: m41t00 driver should use workqueue instead of tasklet
Hi Mark,
Quoted 6 lines
The m41t00 i2c/rtc driver currently uses a tasklet to schedule interrupt-level writes to the rtc. This patch causes the driver to use a workqueue instead. (...)
int
m41t00_set_rtc_time(ulong nowtime)
{
drivers/i2c/chips/m41t00.c m41t00_set_tlet(ulong arg) · line 160
Quoted 8 lines
drivers/i2c/chips/m41t00.c +2
-2new_time = nowtime;if (in_interrupt ()) -tasklet_schedule (&m41t00_tasklet); +schedule_work (&set_rtc_time_task);else -m41t00_set_tlet ((ulong)&new_time); +m41t00_set ((void *)&new_time);
This cast is not needed.
Quoted 3 lines
return 0;
}
Thanks,
Signature · 1 line
Jean Delvare
Re: [PATCH 2.6.16-mm1 1/3] rtc: m41t00 driver should use workqueue instead of tasklet
Resend...
---
The m41t00 i2c/rtc driver currently uses a tasklet to schedule interrupt-level writes to the rtc. This patch causes the driver to use a workqueue instead.
---
m41t00.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-)
---
drivers/i2c/chips/m41t00.c +9 -7
@@ -25,6 +25,7 @@#include <linux/rtc.h> #include <linux/bcd.h> #include <linux/mutex.h> +#include <linux/workqueue.h> #include <asm/time.h> #include <asm/rtc.h>
@@ -111,7 +112,7 @@ m41t00_get_rtc_time(void) }static void -m41t00_set_tlet (ulong arg) +m41t00_set (void *arg) {struct rtc_time tm;ulong nowtime = *(ulong *)arg;
@@ -145,9 +146,9 @@ m41t00_set_tlet(ulong arg)return ; } -static ulong new_time; - -DECLARE_TASKLET_DISABLED (m41t00_tasklet, m41t00_set_tlet, (ulong)&new_time); +static ulong new_time; +static struct workqueue_struct *m41t00_wq; +static DECLARE_WORK(m41t00_work, m41t00_set, &new_time);int m41t00_set_rtc_time (ulong nowtime)
@@ -155,9 +156,9 @@ m41t00_set_rtc_time(ulong nowtime) new_time = nowtime;if (in_interrupt ()) -tasklet_schedule (&m41t00_tasklet); +queue_work (m41t00_wq, &m41t00_work);else -m41t00_set_tlet ((ulong)&new_time); +m41t00_set (&new_time);return 0 ; }
@@ -189,6 +190,7 @@ m41t00_probe(struct i2c_adapter *adap, ireturn rc; } + m41t00_wq =create_singlethread_workqueue ("m41t00" ); save_client = client;return 0 ; }
@@ -206,7 +208,7 @@ m41t00_detach(struct i2c_client *client)if ((rc =i2c_detach_client (client)) ==0 ) {kfree (client); -tasklet_kill (&m41t00_tasklet); +destroy_workqueue (m41t00_wq); }return rc; }
PATCH 2/3 rtc: m41t00 driver cleanup
In reply to Mark A. GreerThis patch does some cleanup to the m41t00 i2c/rtc driver including:
- use BCD2BIN/BIN2BCD instead of BCD_TO_BIN/BIN_TO_BCD
- use strlcpy instead of strncpy
- some whitespace cleanup
---
m41t00.c | 52 +++++++++++++++++++++++----------------------------- 1 files changed, 23 insertions(+), 29 deletions(-)
---
drivers/i2c/chips/m41t00.c +23 -29
@@ -1,6 +1,4 @@/* -* drivers/i2c/chips/m41t00.c -* * I2C client/driver for the ST M41T00 Real-Time Clock chip. * * Author: Mark A. Greer <[email protected]>
@@ -13,9 +11,6 @@/* * This i2c client/driver wedges between the drivers/char/genrtc.c RTC * interface and the SMBus interface of the i2c subsystem. -* It would be more efficient to use i2c msgs/i2c_transfer directly but, as -* recommened in .../Documentation/i2c/writing-clients section -* "Sending and receiving", using SMBus level communication is preferred. */ #include <linux/kernel.h>
@@ -42,17 +37,17 @@ static unsigned short ignore[] = { I2C_Cstatic unsigned short normal_addr[] = {0x68 ,I2C_CLIENT_END };static struct i2c_client_address_data addr_data = { - .normal_i2c = normal_addr, - .probe = ignore, - .ignore = ignore, + .normal_i2c = normal_addr, + .probe = ignore, + .ignore = ignore, };ulong m41t00_get_rtc_time (void ) { -s32 sec, min, hour, day, mon, year; -s32 sec1, min1, hour1, day1, mon1, year1; -ulong limit =10 ; +s32 sec, min, hour, day, mon, year; +s32 sec1, min1, hour1, day1, mon1, year1; +ulong limit =10 ; sec = min = hour = day = mon = year =0 ; sec1 = min1 = hour1 = day1 = mon1 = year1 =0 ;
@@ -98,12 +93,12 @@ m41t00_get_rtc_time(void) mon &=0x1f ; year &=0xff ; -BCD_TO_BIN (sec); -BCD_TO_BIN (min); -BCD_TO_BIN (hour); -BCD_TO_BIN (day); -BCD_TO_BIN (mon); -BCD_TO_BIN (year); + sec =BCD2BIN (sec); + min =BCD2BIN (min); + hour =BCD2BIN (hour); + day =BCD2BIN (day); + mon =BCD2BIN (mon); + year =BCD2BIN (year); year +=1900 ;if (year <1970 )
@@ -116,17 +111,17 @@ static void m41t00_set(void *arg) {struct rtc_time tm; -ulong nowtime = *(ulong *)arg; +ulong nowtime = *(ulong *)arg;to_tm (nowtime, &tm); tm.tm_year = (tm.tm_year -1900 ) %100 ; -BIN_TO_BCD (tm.tm_sec); -BIN_TO_BCD (tm.tm_min); -BIN_TO_BCD (tm.tm_hour); -BIN_TO_BCD (tm.tm_mon); -BIN_TO_BCD (tm.tm_mday); -BIN_TO_BCD (tm.tm_year); + tm.tm_sec =BIN2BCD (tm.tm_sec); + tm.tm_min =BIN2BCD (tm.tm_min); + tm.tm_hour =BIN2BCD (tm.tm_hour); + tm.tm_mon =BIN2BCD (tm.tm_mon); + tm.tm_mday =BIN2BCD (tm.tm_mday); + tm.tm_year =BIN2BCD (tm.tm_year);mutex_lock (&m41t00_mutex); if ((i2c_smbus_write_byte_data(save_client, 0, tm.tm_sec & 0x7f) < 0)
@@ -144,10 +139,9 @@ m41t00_set(void *arg)dev_warn (&save_client->dev,"m41t00: can't write to rtc chip\n" );mutex_unlock (&m41t00_mutex); -return ; } -static ulong new_time; +static ulong new_time;int m41t00_set_rtc_time (ulong nowtime)
@@ -179,7 +173,7 @@ m41t00_probe(struct i2c_adapter *adap, iif (!client)return -ENOMEM ; -strncpy (client->name,M41T00_DRV_NAME ,I2C_NAME_SIZE ); +strlcpy (client->name,M41T00_DRV_NAME ,I2C_NAME_SIZE ); client->addr = addr; client->adapter = adap; client->driver = &m41t00_driver;
@@ -203,7 +197,7 @@ m41t00_attach(struct i2c_adapter *adap)static int m41t00_detach (struct i2c_client *client) { -int rc; +int rc;if ((rc =i2c_detach_client (client)) ==0 ) {kfree (client);
@@ -214,6 +208,7 @@ m41t00_detach(struct i2c_client *client)static struct i2c_driver m41t00_driver = { .driver = { + .owner =THIS_MODULE , .name =M41T00_DRV_NAME , }, .id =I2C_DRIVERID_STM41T00 ,
@@ -231,7 +226,6 @@ static void __exitm41t00_exit (void) {i2c_del_driver (&m41t00_driver); -return ; }module_init (m41t00_init);
Re: [PATCH 2.6.16-mm1 2/3] rtc: m41t00 driver cleanup
Hi Mark,
Quoted 4 lines
This patch does some cleanup to the m41t00 i2c/rtc driver including:
- use BCD2BIN/BIN2BCD instead of BCD_TO_BIN/BIN_TO_BCD
- use strlcpy instead of strncpy
- some whitespace cleanup
Looks overall good, except:
drivers/i2c/chips/m41t00.c m41t00_detach(struct i2c_client *client) · line 214
Quoted 8 lines
drivers/i2c/chips/m41t00.c +1
-0@@ -214,6 +208,7 @@ m41t00_detach(struct i2c_client *client)static struct i2c_driver m41t00_driver = { .driver = { + .owner =THIS_MODULE , .name =M41T00_DRV_NAME , }, .id =I2C_DRIVERID_STM41T00 ,
i2c_add_driver sets the owner for you, so it was omitted here on purpose.
I'll drop that change before pushing the patch to Greg, no need to resend.
Thanks,
Signature · 1 line
Jean Delvare
Re: [PATCH 2.6.16-mm1 2/3] rtc: m41t00 driver cleanup
Quoted 21 lines · Jean Delvare
Hi Mark,
Quoted 4 lines
This patch does some cleanup to the m41t00 i2c/rtc driver including:
- use BCD2BIN/BIN2BCD instead of BCD_TO_BIN/BIN_TO_BCD
- use strlcpy instead of strncpy
- some whitespace cleanupLooks overall good, except:
drivers/i2c/chips/m41t00.c m41t00_detach(struct i2c_client *client) · line 214
Quoted 8 lines
drivers/i2c/chips/m41t00.c +1
-0@@ -214,6 +208,7 @@ m41t00_detach(struct i2c_client *client)static struct i2c_driver m41t00_driver = { .driver = { + .owner =THIS_MODULE , .name =M41T00_DRV_NAME , }, .id =I2C_DRIVERID_STM41T00 ,
i2c_add_driversets the owner for you, so it was omitted here on purpose.
Quoted 2 lines
I'll drop that change before pushing the patch to Greg, no need to resend.
Hang on for a bit, Jean. I'm making a new set of patches with yours and Andrew's comments addressed. Will be out shortly.
Mark
Re: [PATCH 2.6.16-mm1 2/3] rtc: m41t00 driver cleanup
In reply to Jean DelvareResend...
---
This patch does some cleanup to the m41t00 i2c/rtc driver including:
- use BCD2BIN/BIN2BCD instead of BCD_TO_BIN/BIN_TO_BCD
- use strlcpy instead of strncpy
- some whitespace cleanup
---
m41t00.c | 49 +++++++++++++++++++++---------------------------- 1 files changed, 21 insertions(+), 28 deletions(-)
---
drivers/i2c/chips/m41t00.c +21 -28
@@ -1,6 +1,4 @@/* -* drivers/i2c/chips/m41t00.c -* * I2C client/driver for the ST M41T00 Real-Time Clock chip. * * Author: Mark A. Greer <[email protected]>
@@ -13,9 +11,6 @@/* * This i2c client/driver wedges between the drivers/char/genrtc.c RTC * interface and the SMBus interface of the i2c subsystem. -* It would be more efficient to use i2c msgs/i2c_transfer directly but, as -* recommened in .../Documentation/i2c/writing-clients section -* "Sending and receiving", using SMBus level communication is preferred. */ #include <linux/kernel.h>
@@ -41,17 +36,17 @@ static unsigned short ignore[] = { I2C_Cstatic unsigned short normal_addr[] = {0x68 ,I2C_CLIENT_END };static struct i2c_client_address_data addr_data = { - .normal_i2c = normal_addr, - .probe = ignore, - .ignore = ignore, + .normal_i2c = normal_addr, + .probe = ignore, + .ignore = ignore, };ulong m41t00_get_rtc_time (void ) { -s32 sec, min, hour, day, mon, year; -s32 sec1, min1, hour1, day1, mon1, year1; -ulong limit =10 ; +s32 sec, min, hour, day, mon, year; +s32 sec1, min1, hour1, day1, mon1, year1; +ulong limit =10 ; sec = min = hour = day = mon = year =0 ; sec1 = min1 = hour1 = day1 = mon1 = year1 =0 ;
@@ -97,12 +92,12 @@ m41t00_get_rtc_time(void) mon &=0x1f ; year &=0xff ; -BCD_TO_BIN (sec); -BCD_TO_BIN (min); -BCD_TO_BIN (hour); -BCD_TO_BIN (day); -BCD_TO_BIN (mon); -BCD_TO_BIN (year); + sec =BCD2BIN (sec); + min =BCD2BIN (min); + hour =BCD2BIN (hour); + day =BCD2BIN (day); + mon =BCD2BIN (mon); + year =BCD2BIN (year); year +=1900 ;if (year <1970 )
@@ -115,17 +110,17 @@ static void m41t00_set(void *arg) {struct rtc_time tm; -ulong nowtime = *(ulong *)arg; +ulong nowtime = *(ulong *)arg;to_tm (nowtime, &tm); tm.tm_year = (tm.tm_year -1900 ) %100 ; -BIN_TO_BCD (tm.tm_sec); -BIN_TO_BCD (tm.tm_min); -BIN_TO_BCD (tm.tm_hour); -BIN_TO_BCD (tm.tm_mon); -BIN_TO_BCD (tm.tm_mday); -BIN_TO_BCD (tm.tm_year); + tm.tm_sec =BIN2BCD (tm.tm_sec); + tm.tm_min =BIN2BCD (tm.tm_min); + tm.tm_hour =BIN2BCD (tm.tm_hour); + tm.tm_mon =BIN2BCD (tm.tm_mon); + tm.tm_mday =BIN2BCD (tm.tm_mday); + tm.tm_year =BIN2BCD (tm.tm_year);mutex_lock (&m41t00_mutex); if ((i2c_smbus_write_byte_data(save_client, 0, tm.tm_sec & 0x7f) < 0)
@@ -143,7 +138,6 @@ m41t00_set(void *arg)dev_warn (&save_client->dev,"m41t00: can't write to rtc chip\n" );mutex_unlock (&m41t00_mutex); -return ; }static ulong new_time;
@@ -180,7 +174,7 @@ m41t00_probe(struct i2c_adapter *adap, iif (!client)return -ENOMEM ; -strncpy (client->name,M41T00_DRV_NAME ,I2C_NAME_SIZE ); +strlcpy (client->name,M41T00_DRV_NAME ,I2C_NAME_SIZE ); client->addr = addr; client->adapter = adap; client->driver = &m41t00_driver;
@@ -204,7 +198,7 @@ m41t00_attach(struct i2c_adapter *adap)static int m41t00_detach (struct i2c_client *client) { -int rc; +int rc;if ((rc =i2c_detach_client (client)) ==0 ) {kfree (client);
@@ -232,7 +226,6 @@ static void __exitm41t00_exit (void) {i2c_del_driver (&m41t00_driver); -return ; }module_init (m41t00_init);
PATCH 3/3 rtc: add support for m41t81 & m41t85 chips to m41t00 driver
In reply to Mark A. GreerThis patch adds support for the ST m41t81 and m41t85 i2c rtc chips to the existing m41t00 driver.
Since there is no way to reliably determine what type of rtc chip is in use, the chip type is passed in via platform_data. The i2c address and square wave frequency are passed in via platform_data as well. To accommodate the use of platform_data, a new header file include/linux/m41t00.h has been added.
The m41t81 and m41t85 chips halt the updating of their time registers while they are being accessed. They resume when a stop condition exists on the i2c bus or when non-time related regs are accessed. To make the best use of that facility and to make more efficient use of the i2c bus, this patch replaces multiple i2c_smbus_xxx calls with a single i2c_transfer call.
---
drivers/i2c/chips/m41t00.c | 262 +++++++++++++++++++++++++++++++++------------ include/linux/m41t00.h | 50 ++++++++ 2 files changed, 246 insertions(+), 66 deletions(-)
---
drivers/i2c/chips/m41t00.c +196 -66
@@ -1,5 +1,5 @@/* -* I2C client/driver for the ST M41T00 Real-Time Clock chip. +* I2C client/driver for the ST M41T00 family of i2c rtc chips. * * Author: Mark A. Greer <[email protected]> *
@@ -19,22 +19,20 @@#include <linux/i2c.h> #include <linux/rtc.h> #include <linux/bcd.h> -#include <linux/mutex.h> #include <linux/workqueue.h> +#include <linux/platform_device.h> +#include <linux/m41t00.h> #include <asm/time.h> #include <asm/rtc.h> -#define M41T00_DRV_NAME "m41t00" - -static DEFINE_MUTEX (m41t00_mutex);static struct work_struct set_rtc_time_task;static struct i2c_driver m41t00_driver;static struct i2c_client *save_client;static unsigned short ignore[] = {I2C_CLIENT_END }; -static unsigned short normal_addr[] = {0x68 ,I2C_CLIENT_END }; +static unsigned short normal_addr[] = {0 ,I2C_CLIENT_END };static struct i2c_client_address_data addr_data = { .normal_i2c = normal_addr,
@@ -42,34 +40,45 @@ static struct i2c_client_address_data ad .ignore = ignore, }; +struct m41t00_chip_info { +u16 type; +u16 read_limit; +u8 sec;/* Offsets for chip regs */ +u8 min; +u8 hour; +u8 day; +u8 mon; +u8 year; +u8 alarm_mon; +u8 alarm_hour; +u8 sqw; +u32 sqw_freq; +}; + +static struct m41t00_chip_info m41t00_chip_info_tbl[] = { + {M41T00_TYPE_M41T00 ,5 ,0 ,1 ,2 ,4 ,5 ,6 ,0 ,0 ,0 ,0 }, + {M41T00_TYPE_M41T81 ,1 ,1 ,2 ,3 ,5 ,6 ,7 ,0xa ,0xc ,0x13 ,0 }, + {M41T00_TYPE_M41T85 ,1 ,1 ,2 ,3 ,5 ,6 ,7 ,0xa ,0xc ,0x13 ,0 }, +}; +static struct m41t00_chip_info *m41t00_chip; +ulong m41t00_get_rtc_time (void ) {s32 sec, min, hour, day, mon, year;s32 sec1, min1, hour1, day1, mon1, year1; -ulong limit =10 ; +u16 reads =0 ; +u8 buf[8 ], msgbuf[1 ] = {0 };/* offset into rtc's regs */ +struct i2c_msg msgs[] = { + { save_client->addr,0 ,1 , msgbuf }, + { save_client->addr,I2C_M_RD ,8 , buf } + }; sec = min = hour = day = mon = year =0 ; - sec1 = min1 = hour1 = day1 = mon1 = year1 =0 ; -mutex_lock (&m41t00_mutex); do { - if (((sec = i2c_smbus_read_byte_data(save_client, 0)) >= 0) - && ((min = i2c_smbus_read_byte_data(save_client, 1)) - >= 0) - && ((hour = i2c_smbus_read_byte_data(save_client, 2)) - >= 0) - && ((day = i2c_smbus_read_byte_data(save_client, 4)) - >= 0) - && ((mon = i2c_smbus_read_byte_data(save_client, 5)) - >= 0) - && ((year = i2c_smbus_read_byte_data(save_client, 6)) - >= 0) - && ((sec == sec1) && (min == min1) && (hour == hour1) - && (day == day1) && (mon == mon1) - && (year == year1))) - - break; + if (i2c_transfer(save_client->adapter, msgs, 2) < 0) + goto read_err; sec1 = sec; min1 = min;
@@ -77,21 +86,21 @@ m41t00_get_rtc_time(void) day1 = day; mon1 = mon; year1 = year; - }while (--limit >0 ); -mutex_unlock (&m41t00_mutex); -if (limit ==0 ) { -dev_warn (&save_client->dev, -"m41t00: can't read rtc chip\n" ); - sec = min = hour = day = mon = year =0 ; - } - - sec &=0x7f ; - min &=0x7f ; - hour &=0x3f ; - day &=0x3f ; - mon &=0x1f ; - year &=0xff ; + sec = buf[m41t00_chip->sec] &0x7f ; + min = buf[m41t00_chip->min] &0x7f ; + hour = buf[m41t00_chip->hour] &0x3f ; + day = buf[m41t00_chip->day] &0x3f ; + mon = buf[m41t00_chip->mon] &0x1f ; + year = buf[m41t00_chip->year] &0xff ; + }while ((++reads < m41t00_chip->read_limit) && ((sec != sec1) + || (min != min1) || (hour != hour1) || (day != day1) + || (mon != mon1) || (year != year1))); + +if ((m41t00_chip->read_limit >1 ) && ((sec != sec1) || (min != min1) + || (hour != hour1) || (day != day1) || (mon != mon1) + || (year != year1))) + goto read_err; sec =BCD2BIN (sec); min =BCD2BIN (min);
@@ -105,40 +114,49 @@ m41t00_get_rtc_time(void) year +=100 ;return mktime (year, mon, day, hour, min, sec); + +read_err: +dev_err (&save_client->dev,"m41t00_get_rtc_time: Read error\n" ); +return 0 ; }static void m41t00_set (void *arg) {struct rtc_time tm; -ulong nowtime = *(ulong *)arg; +int nowtime = *(int *)arg; +s32 sec, min, hour, day, mon, year; +u8 wbuf[9 ], *buf = &wbuf[1 ], msgbuf[1 ] = {0 }; +struct i2c_msg msgs[] = { + { save_client->addr,0 ,1 , msgbuf }, + { save_client->addr,I2C_M_RD ,8 , buf } + };to_tm (nowtime, &tm); tm.tm_year = (tm.tm_year -1900 ) %100 ; - tm.tm_sec =BIN2BCD (tm.tm_sec); - tm.tm_min =BIN2BCD (tm.tm_min); - tm.tm_hour =BIN2BCD (tm.tm_hour); - tm.tm_mon =BIN2BCD (tm.tm_mon); - tm.tm_mday =BIN2BCD (tm.tm_mday); - tm.tm_year =BIN2BCD (tm.tm_year); - -mutex_lock (&m41t00_mutex); -if ((i2c_smbus_write_byte_data (save_client,0 , tm.tm_sec &0x7f ) <0 ) - || (i2c_smbus_write_byte_data (save_client,1 , tm.tm_min &0x7f ) - <0 ) - || (i2c_smbus_write_byte_data (save_client,2 , tm.tm_hour &0x7f ) - <0 ) - || (i2c_smbus_write_byte_data (save_client,4 , tm.tm_mday &0x7f ) - <0 ) - || (i2c_smbus_write_byte_data (save_client,5 , tm.tm_mon &0x7f ) - <0 ) - || (i2c_smbus_write_byte_data (save_client,6 , tm.tm_year &0x7f ) - <0 )) + sec =BIN2BCD (tm.tm_sec); + min =BIN2BCD (tm.tm_min); + hour =BIN2BCD (tm.tm_hour); + day =BIN2BCD (tm.tm_mday); + mon =BIN2BCD (tm.tm_mon); + year =BIN2BCD (tm.tm_year); + +/* Read reg values into buf[0..7]/wbuf[1..8] */ +if (i2c_transfer (save_client->adapter, msgs,2 ) <0 ) { +dev_err (&save_client->dev,"m41t00_set: Read error\n" ); +return ; + } -dev_warn (&save_client->dev,"m41t00: can't write to rtc chip\n" ); + wbuf[0 ] =0 ;/* offset into rtc's regs */ + buf[m41t00_chip->sec] = (buf[m41t00_chip->sec] & ~0x7f ) | (sec &0x7f ); + buf[m41t00_chip->min] = (buf[m41t00_chip->min] & ~0x7f ) | (min &0x7f ); + buf[m41t00_chip->hour] = (buf[m41t00_chip->hour]& ~0x3f ) | (hour&0x3f ); + buf[m41t00_chip->day] = (buf[m41t00_chip->day] & ~0x3f ) | (day &0x3f ); + buf[m41t00_chip->mon] = (buf[m41t00_chip->mon] & ~0x1f ) | (mon &0x1f ); -mutex_unlock (&m41t00_mutex); +if (i2c_master_send (save_client, wbuf,9 ) <0 ) +dev_err (&save_client->dev,"m41t00_set: Write error\n" ); }static ulong new_time;
@@ -159,6 +177,47 @@ m41t00_set_rtc_time(ulong nowtime)/* ***************************************************************************** * +* platform_data Driver Interface +* +***************************************************************************** +*/ +static int __init +m41t00_platform_probe (struct platform_device *pdev) +{ +struct m41t00_platform_data *pdata; +int i; + +if (pdev && (pdata = pdev->dev.platform_data)) { + normal_addr[0 ] = pdata->i2c_addr; + +for (i=0 ; i<ARRAY_SIZE (m41t00_chip_info_tbl); i++) +if (m41t00_chip_info_tbl[i].type == pdata->type) { + m41t00_chip = &m41t00_chip_info_tbl[i]; + m41t00_chip->sqw_freq = pdata->sqw_freq; +return 0 ; + } + } +return -ENODEV ; +} + +static int __exit +m41t00_platform_remove (struct platform_device *pdev) +{ +return 0 ; +} + +static struct platform_driver m41t00_platform_driver = { + .probe = m41t00_platform_probe, + .remove = m41t00_platform_remove, + .driver = { + .owner =THIS_MODULE , + .name =M41T00_DRV_NAME , + }, +}; + +/* +***************************************************************************** +* * Driver Interface * *****************************************************************************
@@ -168,24 +227,90 @@ m41t00_probe(struct i2c_adapter *adap, i {struct i2c_client *client;int rc; +u8 rbuf[1 ], wbuf[2 ], msgbuf[1 ] = {0 };/* offset into rtc's regs */ +struct i2c_msg msgs[] = { + {0 ,0 ,1 , msgbuf }, + {0 ,I2C_M_RD ,1 , rbuf } + }; client =kzalloc (sizeof (struct i2c_client ),GFP_KERNEL );if (!client)return -ENOMEM ; -strlcpy (client->name,M41T00_DRV_NAME ,I2C_NAME_SIZE ); +strlcpy (client->name, m41t00_driver.driver.name,I2C_NAME_SIZE ); client->addr = addr; client->adapter = adap; client->driver = &m41t00_driver; -if ((rc =i2c_attach_client (client)) !=0 ) { -kfree (client); -return rc; +if ((rc =i2c_attach_client (client)) !=0 ) + goto attach_err; + + msgs[0 ].addr = addr; + msgs[1 ].addr = addr; + +if (m41t00_chip->type !=M41T00_TYPE_M41T00 ) { +/* If asked, set SQW frequency & enable */ +if (m41t00_chip->sqw_freq) { + msgbuf[0 ] = m41t00_chip->alarm_mon; +if ((rc =i2c_transfer (client->adapter, msgs,2 )) <0 ) + goto sqw_err; + + wbuf[0 ] = m41t00_chip->alarm_mon; + wbuf[1 ] = rbuf[0 ] & ~0x40 ; +if ((rc =i2c_master_send (client, wbuf,2 )) <0 ) + goto sqw_err; + + wbuf[0 ] = m41t00_chip->sqw; + wbuf[1 ] = m41t00_chip->sqw_freq; +if ((rc =i2c_master_send (client, wbuf,2 )) <0 ) + goto sqw_err; + + wbuf[0 ] = m41t00_chip->alarm_mon; + wbuf[1 ] = rbuf[0 ] |0x40 ; +if ((rc =i2c_master_send (client, wbuf,2 )) <0 ) + goto sqw_err; + } + +/* Make sure HT (Halt Update) bit is cleared */ + msgbuf[0 ] = m41t00_chip->alarm_hour; +if ((rc =i2c_transfer (client->adapter, msgs,2 )) <0 ) + goto ht_err; + +if (rbuf[0 ] &0x40 ) { + wbuf[0 ] = m41t00_chip->alarm_hour; + wbuf[1 ] = rbuf[0 ] & ~0x40 ; +if ((rc =i2c_master_send (client, wbuf,2 )) <0 ) + goto ht_err; + } + } + +/* Make sure ST (stop) bit is cleared */ + msgbuf[0 ] = m41t00_chip->sec; +if ((rc =i2c_transfer (client->adapter, msgs,2 )) <0 ) + goto st_err; + +if (rbuf[0 ] &0x80 ) { + wbuf[0 ] = m41t00_chip->sec; + wbuf[1 ] = rbuf[0 ] & ~0x80 ; +if ((rc =i2c_master_send (client, wbuf,2 )) <0 ) + goto st_err; }INIT_WORK (&set_rtc_time_task, &m41t00_set, &new_time); save_client = client;return 0 ; + +st_err: +dev_err (&client->dev,"m41t00_probe: Can't clear ST bit\n" ); + goto attach_err; +ht_err: +dev_err (&client->dev,"m41t00_probe: Can't clear HT bit\n" ); + goto attach_err; +sqw_err: +dev_err (&client->dev,"m41t00_probe: Can't set SQW Frequency\n" ); +attach_err: +kfree (client); +return rc; } static int
@@ -219,13 +344,18 @@ static struct i2c_driver m41t00_driver =static int __init m41t00_init (void ) { -return i2c_add_driver (&m41t00_driver); +int rc; + +if (!(rc =platform_driver_register (&m41t00_platform_driver))) + rc =i2c_add_driver (&m41t00_driver); +return rc; } static void __exitm41t00_exit (void ) {i2c_del_driver (&m41t00_driver); +platform_driver_unregister (&m41t00_platform_driver); }module_init (m41t00_init);
include/linux/m41t00.h +50 -0
50 lines not on this page · raw message
Re: [PATCH 2.6.16-mm1 3/3] rtc: add support for m41t81 & m41t85 chips to m41t00 driver
Quoted 4 lines · Mark A. Greer
+ struct
i2c_msgmsgs[] = {
+ {save_client->addr, 0, 1, msgbuf },
+ {save_client->addr,I2C_M_RD, 8, buf }
The
.name = value,
form would be preferred. It reduces the possibility of silent breakage if someone changes struct i2c_msg.
Re: [PATCH 2.6.16-mm1 3/3] rtc: add support for m41t81 & m41t85 chips to m41t00 driver
Hi Andrew,
Quoted 6 lines · Andrew Morton
Quoted 4 lines · Mark A. Greer
+ struct
i2c_msgmsgs[] = {
+ {save_client->addr, 0, 1, msgbuf },
+ {save_client->addr,I2C_M_RD, 8, buf }
Quoted 6 lines
The
.name = value,
form would be preferred. It reduces the possibility of silent breakage if someone changes struct
i2c_msg.
Noted. Will fix in upcoming set of new patches.
Mark
Re: [PATCH 2.6.16-mm1 3/3] rtc: add support for m41t81 & m41t85 chips to m41t00 driver
In reply to Andrew MortonResend...
---
drivers/i2c/chips/m41t00.c | 294 ++++++++++++++++++++++++++++++++++----------- include/linux/m41t00.h | 50 +++++++ 2 files changed, 276 insertions(+), 68 deletions(-)
---
drivers/i2c/chips/m41t00.c +226 -68
@@ -1,5 +1,5 @@/* -* I2C client/driver for the ST M41T00 Real-Time Clock chip. +* I2C client/driver for the ST M41T00 family of i2c rtc chips. * * Author: Mark A. Greer <[email protected]> *
@@ -19,21 +19,17 @@#include <linux/i2c.h> #include <linux/rtc.h> #include <linux/bcd.h> -#include <linux/mutex.h> #include <linux/workqueue.h> - +#include <linux/platform_device.h> +#include <linux/m41t00.h> #include <asm/time.h> #include <asm/rtc.h> -#define M41T00_DRV_NAME "m41t00" - -static DEFINE_MUTEX (m41t00_mutex); -static struct i2c_driver m41t00_driver;static struct i2c_client *save_client;static unsigned short ignore[] = {I2C_CLIENT_END }; -static unsigned short normal_addr[] = {0x68 ,I2C_CLIENT_END }; +static unsigned short normal_addr[] = {0 ,I2C_CLIENT_END };static struct i2c_client_address_data addr_data = { .normal_i2c = normal_addr,
@@ -41,34 +37,55 @@ static struct i2c_client_address_data ad .ignore = ignore, }; +struct m41t00_chip_info { +u16 type; +u16 read_limit; +u8 sec;/* Offsets for chip regs */ +u8 min; +u8 hour; +u8 day; +u8 mon; +u8 year; +u8 alarm_mon; +u8 alarm_hour; +u8 sqw; +u32 sqw_freq; +}; + +static struct m41t00_chip_info m41t00_chip_info_tbl[] = { + {M41T00_TYPE_M41T00 ,5 ,0 ,1 ,2 ,4 ,5 ,6 ,0 ,0 ,0 ,0 }, + {M41T00_TYPE_M41T81 ,1 ,1 ,2 ,3 ,5 ,6 ,7 ,0xa ,0xc ,0x13 ,0 }, + {M41T00_TYPE_M41T85 ,1 ,1 ,2 ,3 ,5 ,6 ,7 ,0xa ,0xc ,0x13 ,0 }, +}; +static struct m41t00_chip_info *m41t00_chip; +ulong m41t00_get_rtc_time (void ) {s32 sec, min, hour, day, mon, year;s32 sec1, min1, hour1, day1, mon1, year1; -ulong limit =10 ; +u16 reads =0 ; +u8 buf[8 ], msgbuf[1 ] = {0 };/* offset into rtc's regs */ +struct i2c_msg msgs[] = { + { + .addr = save_client->addr, + .flags =0 , + .len =1 , + .buf = msgbuf, + }, + { + .addr = save_client->addr, + .flags =I2C_M_RD , + .len =8 , + .buf = buf, + }, + }; sec = min = hour = day = mon = year =0 ; - sec1 = min1 = hour1 = day1 = mon1 = year1 =0 ; -mutex_lock (&m41t00_mutex); do { - if (((sec = i2c_smbus_read_byte_data(save_client, 0)) >= 0) - && ((min = i2c_smbus_read_byte_data(save_client, 1)) - >= 0) - && ((hour = i2c_smbus_read_byte_data(save_client, 2)) - >= 0) - && ((day = i2c_smbus_read_byte_data(save_client, 4)) - >= 0) - && ((mon = i2c_smbus_read_byte_data(save_client, 5)) - >= 0) - && ((year = i2c_smbus_read_byte_data(save_client, 6)) - >= 0) - && ((sec == sec1) && (min == min1) && (hour == hour1) - && (day == day1) && (mon == mon1) - && (year == year1))) - - break; + if (i2c_transfer(save_client->adapter, msgs, 2) < 0) + goto read_err; sec1 = sec; min1 = min;
@@ -76,21 +93,21 @@ m41t00_get_rtc_time(void) day1 = day; mon1 = mon; year1 = year; - }while (--limit >0 ); -mutex_unlock (&m41t00_mutex); - -if (limit ==0 ) { -dev_warn (&save_client->dev, -"m41t00: can't read rtc chip\n" ); - sec = min = hour = day = mon = year =0 ; - } - sec &=0x7f ; - min &=0x7f ; - hour &=0x3f ; - day &=0x3f ; - mon &=0x1f ; - year &=0xff ; + sec = buf[m41t00_chip->sec] &0x7f ; + min = buf[m41t00_chip->min] &0x7f ; + hour = buf[m41t00_chip->hour] &0x3f ; + day = buf[m41t00_chip->day] &0x3f ; + mon = buf[m41t00_chip->mon] &0x1f ; + year = buf[m41t00_chip->year] &0xff ; + }while ((++reads < m41t00_chip->read_limit) && ((sec != sec1) + || (min != min1) || (hour != hour1) || (day != day1) + || (mon != mon1) || (year != year1))); + +if ((m41t00_chip->read_limit >1 ) && ((sec != sec1) || (min != min1) + || (hour != hour1) || (day != day1) || (mon != mon1) + || (year != year1))) + goto read_err; sec =BCD2BIN (sec); min =BCD2BIN (min);
@@ -104,40 +121,59 @@ m41t00_get_rtc_time(void) year +=100 ;return mktime (year, mon, day, hour, min, sec); + +read_err: +dev_err (&save_client->dev,"m41t00_get_rtc_time: Read error\n" ); +return 0 ; }static void m41t00_set (void *arg) {struct rtc_time tm; -ulong nowtime = *(ulong *)arg; +int nowtime = *(int *)arg; +s32 sec, min, hour, day, mon, year; +u8 wbuf[9 ], *buf = &wbuf[1 ], msgbuf[1 ] = {0 }; +struct i2c_msg msgs[] = { + { + .addr = save_client->addr, + .flags =0 , + .len =1 , + .buf = msgbuf, + }, + { + .addr = save_client->addr, + .flags =I2C_M_RD , + .len =8 , + .buf = buf, + }, + };to_tm (nowtime, &tm); tm.tm_year = (tm.tm_year -1900 ) %100 ; - tm.tm_sec =BIN2BCD (tm.tm_sec); - tm.tm_min =BIN2BCD (tm.tm_min); - tm.tm_hour =BIN2BCD (tm.tm_hour); - tm.tm_mon =BIN2BCD (tm.tm_mon); - tm.tm_mday =BIN2BCD (tm.tm_mday); - tm.tm_year =BIN2BCD (tm.tm_year); - -mutex_lock (&m41t00_mutex); -if ((i2c_smbus_write_byte_data (save_client,0 , tm.tm_sec &0x7f ) <0 ) - || (i2c_smbus_write_byte_data (save_client,1 , tm.tm_min &0x7f ) - <0 ) - || (i2c_smbus_write_byte_data (save_client,2 , tm.tm_hour &0x7f ) - <0 ) - || (i2c_smbus_write_byte_data (save_client,4 , tm.tm_mday &0x7f ) - <0 ) - || (i2c_smbus_write_byte_data (save_client,5 , tm.tm_mon &0x7f ) - <0 ) - || (i2c_smbus_write_byte_data (save_client,6 , tm.tm_year &0x7f ) - <0 )) + sec =BIN2BCD (tm.tm_sec); + min =BIN2BCD (tm.tm_min); + hour =BIN2BCD (tm.tm_hour); + day =BIN2BCD (tm.tm_mday); + mon =BIN2BCD (tm.tm_mon); + year =BIN2BCD (tm.tm_year); + +/* Read reg values into buf[0..7]/wbuf[1..8] */ +if (i2c_transfer (save_client->adapter, msgs,2 ) <0 ) { +dev_err (&save_client->dev,"m41t00_set: Read error\n" ); +return ; + } -dev_warn (&save_client->dev,"m41t00: can't write to rtc chip\n" ); + wbuf[0 ] =0 ;/* offset into rtc's regs */ + buf[m41t00_chip->sec] = (buf[m41t00_chip->sec] & ~0x7f ) | (sec &0x7f ); + buf[m41t00_chip->min] = (buf[m41t00_chip->min] & ~0x7f ) | (min &0x7f ); + buf[m41t00_chip->hour] = (buf[m41t00_chip->hour]& ~0x3f ) | (hour&0x3f ); + buf[m41t00_chip->day] = (buf[m41t00_chip->day] & ~0x3f ) | (day &0x3f ); + buf[m41t00_chip->mon] = (buf[m41t00_chip->mon] & ~0x1f ) | (mon &0x1f ); -mutex_unlock (&m41t00_mutex); +if (i2c_master_send (save_client, wbuf,9 ) <0 ) +dev_err (&save_client->dev,"m41t00_set: Write error\n" ); }static ulong new_time;
@@ -160,6 +196,47 @@ m41t00_set_rtc_time(ulong nowtime)/* ***************************************************************************** * +* platform_data Driver Interface +* +***************************************************************************** +*/ +static int __init +m41t00_platform_probe (struct platform_device *pdev) +{ +struct m41t00_platform_data *pdata; +int i; + +if (pdev && (pdata = pdev->dev.platform_data)) { + normal_addr[0 ] = pdata->i2c_addr; + +for (i=0 ; i<ARRAY_SIZE (m41t00_chip_info_tbl); i++) +if (m41t00_chip_info_tbl[i].type == pdata->type) { + m41t00_chip = &m41t00_chip_info_tbl[i]; + m41t00_chip->sqw_freq = pdata->sqw_freq; +return 0 ; + } + } +return -ENODEV ; +} + +static int __exit +m41t00_platform_remove (struct platform_device *pdev) +{ +return 0 ; +} + +static struct platform_driver m41t00_platform_driver = { + .probe = m41t00_platform_probe, + .remove = m41t00_platform_remove, + .driver = { + .owner =THIS_MODULE , + .name =M41T00_DRV_NAME , + }, +}; + +/* +***************************************************************************** +* * Driver Interface * *****************************************************************************
@@ -169,24 +246,100 @@ m41t00_probe(struct i2c_adapter *adap, i {struct i2c_client *client;int rc; +u8 rbuf[1 ], wbuf[2 ], msgbuf[1 ] = {0 };/* offset into rtc's regs */ +struct i2c_msg msgs[] = { + { + .addr =0 , + .flags =0 , + .len =1 , + .buf = msgbuf, + }, + { + .addr =0 , + .flags =I2C_M_RD , + .len =1 , + .buf = rbuf, + }, + }; client =kzalloc (sizeof (struct i2c_client ),GFP_KERNEL );if (!client)return -ENOMEM ; -strlcpy (client->name,M41T00_DRV_NAME ,I2C_NAME_SIZE ); +strlcpy (client->name, m41t00_driver.driver.name,I2C_NAME_SIZE ); client->addr = addr; client->adapter = adap; client->driver = &m41t00_driver; -if ((rc =i2c_attach_client (client)) !=0 ) { -kfree (client); -return rc; +if ((rc =i2c_attach_client (client)) !=0 ) + goto attach_err; + + msgs[0 ].addr = addr; + msgs[1 ].addr = addr; + +if (m41t00_chip->type !=M41T00_TYPE_M41T00 ) { +/* If asked, set SQW frequency & enable */ +if (m41t00_chip->sqw_freq) { + msgbuf[0 ] = m41t00_chip->alarm_mon; +if ((rc =i2c_transfer (client->adapter, msgs,2 )) <0 ) + goto sqw_err; + + wbuf[0 ] = m41t00_chip->alarm_mon; + wbuf[1 ] = rbuf[0 ] & ~0x40 ; +if ((rc =i2c_master_send (client, wbuf,2 )) <0 ) + goto sqw_err; + + wbuf[0 ] = m41t00_chip->sqw; + wbuf[1 ] = m41t00_chip->sqw_freq; +if ((rc =i2c_master_send (client, wbuf,2 )) <0 ) + goto sqw_err; + + wbuf[0 ] = m41t00_chip->alarm_mon; + wbuf[1 ] = rbuf[0 ] |0x40 ; +if ((rc =i2c_master_send (client, wbuf,2 )) <0 ) + goto sqw_err; + } + +/* Make sure HT (Halt Update) bit is cleared */ + msgbuf[0 ] = m41t00_chip->alarm_hour; +if ((rc =i2c_transfer (client->adapter, msgs,2 )) <0 ) + goto ht_err; + +if (rbuf[0 ] &0x40 ) { + wbuf[0 ] = m41t00_chip->alarm_hour; + wbuf[1 ] = rbuf[0 ] & ~0x40 ; +if ((rc =i2c_master_send (client, wbuf,2 )) <0 ) + goto ht_err; + } + } + +/* Make sure ST (stop) bit is cleared */ + msgbuf[0 ] = m41t00_chip->sec; +if ((rc =i2c_transfer (client->adapter, msgs,2 )) <0 ) + goto st_err; + +if (rbuf[0 ] &0x80 ) { + wbuf[0 ] = m41t00_chip->sec; + wbuf[1 ] = rbuf[0 ] & ~0x80 ; +if ((rc =i2c_master_send (client, wbuf,2 )) <0 ) + goto st_err; } m41t00_wq =create_singlethread_workqueue ("m41t00" ); save_client = client;return 0 ; + +st_err: +dev_err (&client->dev,"m41t00_probe: Can't clear ST bit\n" ); + goto attach_err; +ht_err: +dev_err (&client->dev,"m41t00_probe: Can't clear HT bit\n" ); + goto attach_err; +sqw_err: +dev_err (&client->dev,"m41t00_probe: Can't set SQW Frequency\n" ); +attach_err: +kfree (client); +return rc; } static int
@@ -219,13 +372,18 @@ static struct i2c_driver m41t00_driver =static int __init m41t00_init (void ) { -return i2c_add_driver (&m41t00_driver); +int rc; + +if (!(rc =platform_driver_register (&m41t00_platform_driver))) + rc =i2c_add_driver (&m41t00_driver); +return rc; } static void __exitm41t00_exit (void ) {i2c_del_driver (&m41t00_driver); +platform_driver_unregister (&m41t00_platform_driver); }module_init (m41t00_init);
include/linux/m41t00.h +50 -0
50 lines not on this page · raw message
Re: [PATCH 2.6.16-mm1 3/3] rtc: add support for m41t81 & m41t85 chips to m41t00 driver
Quoted 6 lines · Mark A. Greer
Resend...
---drivers/i2c/chips/m41t00.c | 294 ++++++++++++++++++++++++++++++++++----------- include/linux/m41t00.h | 50 +++++++
Not sure what to make of this. It has no changelog, it doesn't apply on top of your previous three patches:
rtc-m41t00-driver-should-use-workqueue-instead-of-tasklet.patch rtc-m41t00-driver-cleanup.patch rtc-add-support-for-m41t81-m41t85-chips-to-m41t00-driver.patch
and it doesn't apply when used to replace rtc-add-support-for-m41t81-m41t85-chips-to-m41t00-driver.patch.
An incremental patch against the three above patches would be ideal...
Re: [PATCH 2.6.16-mm1 3/3] rtc: add support for m41t81 & m41t85 chips to m41t00 driver
Hi Mark, Andrew,
Quoted 8 lines
Quoted 6 lines · Mark A. Greer
Resend...
---drivers/i2c/chips/m41t00.c | 294 ++++++++++++++++++++++++++++++++++----------- include/linux/m41t00.h | 50 +++++++
Quoted 9 lines · Andrew Morton
Not sure what to make of this. It has no changelog, it doesn't apply on top of your previous three patches:
rtc-m41t00-driver-should-use-workqueue-instead-of-tasklet.patch rtc-m41t00-driver-cleanup.patch rtc-add-support-for-m41t81-m41t85-chips-to-m41t00-driver.patch
and it doesn't apply when used to replace rtc-add-support-for-m41t81-m41t85-chips-to-m41t00-driver.patch.
Replacing works for me, after also replacing the two first patches of the series with their new respective version. As for the changelog I picked the one from the original third patch.
Quoted 1 line
An incremental patch against the three above patches would be ideal...
Well, the first two patches (workqueue and cleanup) look ok to me now, so I'll send them to Greg now, together with one similar patch for the ds1374 driver. The workqueue patches need to go to Linus soon, as they fix a bug in these drivers, and I know that Greg has other i2c patches waiting to go to Linus anyway. The cleanup patch can go in too, I think, as it's simple enough.
As for the third patch, I have some more comments on it (sorry for being slow) and it might need some tweaking, so it's probably better (and easier) if Andrew just drops it for now, and it'll get back to him when ready.
Mark, is it OK if this third patch adding the m41t81 and m41t85 support spends some time in Andrew's tree and only goes in mainline for 2.6.18, or do you need it in 2.6.17?
Thanks,
Signature · 1 line
Jean Delvare
Re: [PATCH 2.6.16-mm1 3/3] rtc: add support for m41t81 & m41t85 chips to m41t00 driver
Quoted 4 lines · Jean Delvare
Hi Mark, Andrew,
Quoted 2 lines
Quoted 1 line · Mark A. Greer
Quoted 9 lines
Quoted 6 lines
Quoted 5 lines
Resend...
---drivers/i2c/chips/m41t00.c | 294 ++++++++++++++++++++++++++++++++++----------- include/linux/m41t00.h | 50 +++++++Quoted 1 line · Andrew Morton
Not sure what to make of this. It has no changelog,
Oops. My bad.
Quoted 7 lines
Quoted 7 lines
it doesn't apply on
top of your previous three patches:rtc-m41t00-driver-should-use-workqueue-instead-of-tasklet.patch rtc-m41t00-driver-cleanup.patch rtc-add-support-for-m41t81-m41t85-chips-to-m41t00-driver.patch
Quoted 6 lines
Quoted 2 lines
and it doesn't apply when used to replace rtc-add-support-for-m41t81-m41t85-chips-to-m41t00-driver.patch.
Replacing works for me, after also replacing the two first patches of the series with their new respective version. As for the changelog I picked the one from the original third patch.
Sorry for the confusion, Andrew. The 3 patches I sent were all replacement patches for the previous 3 patches.
Quoted 1 line
Quoted 1 line
An incremental patch against the three above patches would be ideal...
I would have done that but there wasn't a 2.6.16-mm2 patch yesterday (that I see is there now) so I had nothing to diff against.
<snip>
Quoted 3 lines
Mark, is it OK if this third patch adding the m41t81 and m41t85 support spends some time in Andrew's tree and only goes in mainline for 2.6.18, or do you need it in 2.6.17?
No, waiting is fine, Jean.
Thanks guys.
Mark
Re: [PATCH 2.6.16-mm1 3/3] rtc: add support for m41t81 & m41t85 chips to m41t00 driver
In reply to Mark A. GreerHi Mark,
Some more comments, sorry for being slow.
Quoted 2 lines
drivers/i2c/chips/m41t00.c | 294 ++++++++++++++++++++++++++++++++++----------- include/linux/m41t00.h | 50 +++++++
Who else is going to use this header file? It's rather rare to have a hardware-specific header file under include/linux.
drivers/i2c/chips/m41t00.c line 32
Quoted 7 lines
diff -Nurp
linux-2.6.16-mm1-cleanup/drivers/i2c/chips/m41t00.clinux-2.6.16-mm1-newsupp/drivers/i2c/chips/m41t00.cdrivers/i2c/chips/m41t00.c +1
-1static unsigned short ignore[] = {I2C_CLIENT_END }; -static unsigned short normal_addr[] = {0x68 ,I2C_CLIENT_END }; +static unsigned short normal_addr[] = {0 ,I2C_CLIENT_END };
Bad idea. If no platform data is found, the driver will attempt to probe I2C address 0, which is a broadcast address. I can predict interesting results ;)
So, if you don't want the driver to do anything in the absence of platform data, you should define normal_addr the following way:
static unsigned short normal_addr[] = { I2C_CLIENT_END, I2C_CLIENT_END };
Quoted 4 lines
drivers/i2c/chips/m41t00.c +4
-0+struct m41t00_chip_info { +u16 type; +u16 read_limit; +u8 sec;/* Offsets for chip regs */
drivers/i2c/chips/m41t00.c static struct i2c_client_address_data ad · line 53
Quoted 10 lines
drivers/i2c/chips/m41t00.c +10
-0+u8 min; +u8 hour; +u8 day; +u8 mon; +u8 year; +u8 alarm_mon; +u8 alarm_hour; +u8 sqw; +u32 sqw_freq; +};
u16 is probably overkill for .type and .read_limit.
drivers/i2c/chips/m41t00.c static struct i2c_client_address_data ad · line 59
Quoted 5 lines
drivers/i2c/chips/m41t00.c +5
-0+static struct m41t00_chip_info m41t00_chip_info_tbl[] = { + {M41T00_TYPE_M41T00 ,5 ,0 ,1 ,2 ,4 ,5 ,6 ,0 ,0 ,0 ,0 }, + {M41T00_TYPE_M41T81 ,1 ,1 ,2 ,3 ,5 ,6 ,7 ,0xa ,0xc ,0x13 ,0 }, + {M41T00_TYPE_M41T85 ,1 ,1 ,2 ,3 ,5 ,6 ,7 ,0xa ,0xc ,0x13 ,0 }, +};
C99-style initialization, please? It'll take much more lines, granted, but is also way more robust to future changes, and will be more readable too.
May I ask why you define separate types for the M41T81 and the M41T85, when you handle both exactly the same way?
drivers/i2c/chips/m41t00.c m41t00_get_rtc_time(void) · line 102
Quoted 6 lines
drivers/i2c/chips/m41t00.c +6
-0+ sec = buf[m41t00_chip->sec] &0x7f ; + min = buf[m41t00_chip->min] &0x7f ; + hour = buf[m41t00_chip->hour] &0x3f ; + day = buf[m41t00_chip->day] &0x3f ; + mon = buf[m41t00_chip->mon] &0x1f ; + year = buf[m41t00_chip->year] &0xff ;
The year masking is a no-op, you could omit it.
Quoted 9 lines
drivers/i2c/chips/m41t00.c +5
-0@@ -169,24 +246,100 @@ m41t00_probe(struct i2c_adapter *adap, i {struct i2c_client *client;int rc; +u8 rbuf[1 ], wbuf[2 ], msgbuf[1 ] = {0 };/* offset into rtc's regs */ +struct i2c_msg msgs[] = { + { + .addr =0 , + .flags =0 ,
drivers/i2c/chips/m41t00.c m41t00_probe(struct i2c_adapter *adap, i · line 263
Quoted 10 lines
drivers/i2c/chips/m41t00.c +10
-0+ .len = 1, + .buf = msgbuf, + }, + { + .addr = 0, + .flags = I2C_M_RD, + .len = 1, + .buf = rbuf, + }, + };
Why don't you initialize both .addr right away?
drivers/i2c/chips/m41t00.c m41t00_probe(struct i2c_adapter *adap, i · line 269
Quoted 7 lines
drivers/i2c/chips/m41t00.c +1
-1client =kzalloc (sizeof (struct i2c_client ),GFP_KERNEL );if (!client)return -ENOMEM ; -strlcpy (client->name,M41T00_DRV_NAME ,I2C_NAME_SIZE ); +strlcpy (client->name, m41t00_driver.driver.name,I2C_NAME_SIZE );
The driver name may not be suitable here, the client name should instead reflect what chip it is.
drivers/i2c/chips/m41t00.c m41t00_probe(struct i2c_adapter *adap, i · line 285
Quoted 6 lines
drivers/i2c/chips/m41t00.c +6
-0+if (m41t00_chip->type !=M41T00_TYPE_M41T00 ) { +/* If asked, set SQW frequency & enable */ +if (m41t00_chip->sqw_freq) { + msgbuf[0 ] = m41t00_chip->alarm_mon; +if ((rc =i2c_transfer (client->adapter, msgs,2 )) <0 ) + goto sqw_err;
You did not check whether the adapter you are attaching to supports this kind of transaction! You need to call i2c_check_functionality, see how other i2c chip drivers (for example ds1337) are doing. For i2c_transfer and i2c_master_send, you want to check for I2C_FUNC_I2C.
Quoted 31 lines
drivers/i2c/chips/m41t00.c +31
-0+ + wbuf[0 ] = m41t00_chip->alarm_mon; + wbuf[1 ] = rbuf[0 ] & ~0x40 ; +if ((rc =i2c_master_send (client, wbuf,2 )) <0 ) + goto sqw_err; + + wbuf[0 ] = m41t00_chip->sqw; + wbuf[1 ] = m41t00_chip->sqw_freq; +if ((rc =i2c_master_send (client, wbuf,2 )) <0 ) + goto sqw_err; + + wbuf[0 ] = m41t00_chip->alarm_mon; + wbuf[1 ] = rbuf[0 ] |0x40 ; +if ((rc =i2c_master_send (client, wbuf,2 )) <0 ) + goto sqw_err; + } + +/* Make sure HT (Halt Update) bit is cleared */ + msgbuf[0 ] = m41t00_chip->alarm_hour; +if ((rc =i2c_transfer (client->adapter, msgs,2 )) <0 ) + goto ht_err; + +if (rbuf[0 ] &0x40 ) { + wbuf[0 ] = m41t00_chip->alarm_hour; + wbuf[1 ] = rbuf[0 ] & ~0x40 ; +if ((rc =i2c_master_send (client, wbuf,2 )) <0 ) + goto ht_err; + } + } + +/* Make sure ST (stop) bit is cleared */
drivers/i2c/chips/m41t00.c m41t00_probe(struct i2c_adapter *adap, i · line 326
Quoted 10 lines
drivers/i2c/chips/m41t00.c +9
-0+ msgbuf[0 ] = m41t00_chip->sec; +if ((rc =i2c_transfer (client->adapter, msgs,2 )) <0 ) + goto st_err; + +if (rbuf[0 ] &0x80 ) { + wbuf[0 ] = m41t00_chip->sec; + wbuf[1 ] = rbuf[0 ] & ~0x80 ; +if ((rc =i2c_master_send (client, wbuf,2 )) <0 ) + goto st_err; }
What you do here are basically SMBus Read Byte and SMBus Write Byte transactions. The code would be much more simple if you were using the i2c_smbus_read_byte_data and i2c_smbus_write_byte_data functions, which take care of all the technical details.
drivers/i2c/chips/m41t00.c m41t00_probe(struct i2c_adapter *adap, i · line 343
Quoted 12 lines
drivers/i2c/chips/m41t00.c +11
-0+st_err: +dev_err (&client->dev,"m41t00_probe: Can't clear ST bit\n" ); + goto attach_err; +ht_err: +dev_err (&client->dev,"m41t00_probe: Can't clear HT bit\n" ); + goto attach_err; +sqw_err: +dev_err (&client->dev,"m41t00_probe: Can't set SQW Frequency\n" ); +attach_err: +kfree (client); +return rc; }
Mrghh, this isn't exactly elegant... You should be able to make it better if you switch to i2c_smbus_read/write_byte_data as suggested.
include/linux/m41t00.h line 6
Quoted 10 lines
diff -Nurp
linux-2.6.16-mm1-cleanup/include/linux/m41t00.hlinux-2.6.16-mm1-newsupp/include/linux/m41t00.hinclude/linux/m41t00.h +6
-0@@ -0,0 +1,50 @@ +/* +* Definitions for the ST M41T00 family of i2c rtc chips. +* +* Author: Mark A. Greer <[email protected]> +* +* 2005 (c) MontaVista Software, Inc. This file is licensed under
We're in year 2006 now :)
include/linux/m41t00.h line 15
Quoted 9 lines
include/linux/m41t00.h +9
-0+* the terms of the GNU General Public License version 2. This program +* is licensed "as is" without any warranty of any kind, whether express +* or implied. +*/ + +#ifndef _M41T00_H +#define _M41T00_H + +#define M41T00_DRV_NAME "m41t00"
Why do you need to export this?
include/linux/m41t00.h line 16
Quoted 1 line
include/linux/m41t00.h +1
-0+#define M41T00_I2C_ADDR 0x68
Not used anywhere?
include/linux/m41t00.h line 20
Quoted 3 lines
include/linux/m41t00.h +3
-0+#define M41T00_TYPE_M41T00 0 +#define M41T00_TYPE_M41T81 81 +#define M41T00_TYPE_M41T85 85
The i2c core has a facility for drivers supporting several types of devices. Check for I2C_CLIENT_INSMOD_3() in your case. The advantage if you go that way is that chip types can be set from userspace through module parameters, which may be convenient for testing when adding support for new platforms.
Quoted 8 lines
include/linux/m41t00.h +8
-0+/* SQW output disabled, this is default value by power on*/ +#define SQW_FREQ_DISABLE (0) + +#define SQW_FREQ_32KHZ (1<<4)/* 32.768 KHz */ +#define SQW_FREQ_8KHZ (2<<4)/* 8.192 KHz */ +#define SQW_FREQ_4KHZ (3<<4)/* 4.096 KHz */ +#define SQW_FREQ_2KHZ (4<<4)/* 2.048 KHz */ +#define SQW_FREQ_1KHZ (5<<4)/* 1.024 KHz */
include/linux/m41t00.h line 45
Quoted 10 lines
include/linux/m41t00.h +10
-0+#define SQW_FREQ_512HZ (6<<4)/* 512 Hz */ +#define SQW_FREQ_256HZ (7<<4)/* 256 Hz */ +#define SQW_FREQ_128HZ (8<<4)/* 128 Hz */ +#define SQW_FREQ_64HZ (9<<4)/* 64 Hz */ +#define SQW_FREQ_32HZ (10<<4)/* 32 Hz */ +#define SQW_FREQ_16HZ (11<<4)/* 16 Hz */ +#define SQW_FREQ_8HZ (12<<4)/* 8 Hz */ +#define SQW_FREQ_4HZ (13<<4)/* 4 Hz */ +#define SQW_FREQ_2HZ (14<<4)/* 2 Hz */ +#define SQW_FREQ_1HZ (15<<4)/* 1 Hz */
Not used anywhere either?
include/linux/m41t00.h line 48
Quoted 2 lines
include/linux/m41t00.h +2
-0+extern ulong m41t00_get_rtc_time (void ); +extern int m41t00_set_rtc_time (ulong nowtime);
Hopefully you won't have to export these anymore after you move to the new RTC subsystem. But that's a different story. In the meantime, shouldn't you have EXPORT_SYMBOL_GPL() for these functions? Else compiling m41t00 as a module won't work.
Thanks,
Signature · 1 line
Jean Delvare
Re: [PATCH 2.6.16-mm1 3/3] rtc: add support for m41t81 & m41t85 chips to m41t00 driver
Hi Jean,
Quoted 3 lines · Jean Delvare
Hi Mark,
Some more comments, sorry for being slow.
You're not slow at all. No worries.
Quoted 5 lines
Quoted 2 lines
drivers/i2c/chips/m41t00.c | 294 ++++++++++++++++++++++++++++++++++----------- include/linux/m41t00.h | 50 +++++++Who else is going to use this header file? It's rather rare to have a hardware-specific header file under
include/linux.
The platform-specific code for any platform that uses that rtc will need to include that header file so it can pass the platform data to the rtc driver. I have a patch for arch/ppc/platforms/katana.c but I haven't submitted it b/c of the ppc->powerpc merge that's going on right now. I will get it in there once I've moved the katana code into the merged tree. There is a lot of work before that happens, though.
Quoted 12 lines
drivers/i2c/chips/m41t00.c
Quoted 7 lines
diff -Nurp
linux-2.6.16-mm1-cleanup/drivers/i2c/chips/m41t00.clinux-2.6.16-mm1-newsupp/drivers/i2c/chips/m41t00.cdrivers/i2c/chips/m41t00.c +1
-1static unsigned short ignore[] = {I2C_CLIENT_END }; -static unsigned short normal_addr[] = {0x68 ,I2C_CLIENT_END }; +static unsigned short normal_addr[] = {0 ,I2C_CLIENT_END };Bad idea. If no platform data is found, the driver will attempt to probe I2C address 0, which is a broadcast address. I can predict interesting results ;)
Quoted 2 lines
So, if you don't want the driver to do anything in the absence of platform data, you should define
normal_addrthe following way:
If there is no platform data, m41t00_platform_probe() should return -ENODEV and make m41t00_init() causing the driver to not become active. I've tested that, actually, and it seems to work.
Quoted 1 line
static unsigned short normal_addr[] = {
I2C_CLIENT_END,I2C_CLIENT_END};
Hrm, that's a good idea. I'll do that, even though it shouldn't be necessary.
Quoted 8 lines
Quoted 8 lines
drivers/i2c/chips/m41t00.c +8
-0+struct m41t00_chip_info { +u16 type; +u16 read_limit; +u8 sec;/* Offsets for chip regs */ +u8 min; +u8 hour; +u8 day; +u8 mon;
Quoted 8 lines
drivers/i2c/chips/m41t00.c
Quoted 6 lines
drivers/i2c/chips/m41t00.c +6
-0+u8 year; +u8 alarm_mon; +u8 alarm_hour; +u8 sqw; +u32 sqw_freq; +};u16 is probably overkill for .type and .read_limit.
Yeah, probably. I'll change them to u8.
Quoted 9 lines
drivers/i2c/chips/m41t00.c
Quoted 5 lines
drivers/i2c/chips/m41t00.c +5
-0+static struct m41t00_chip_info m41t00_chip_info_tbl[] = { + {M41T00_TYPE_M41T00 ,5 ,0 ,1 ,2 ,4 ,5 ,6 ,0 ,0 ,0 ,0 }, + {M41T00_TYPE_M41T81 ,1 ,1 ,2 ,3 ,5 ,6 ,7 ,0xa ,0xc ,0x13 ,0 }, + {M41T00_TYPE_M41T85 ,1 ,1 ,2 ,3 ,5 ,6 ,7 ,0xa ,0xc ,0x13 ,0 }, +};C99-style initialization, please? It'll take much more lines, granted, but is also way more robust to future changes, and will be more readable too.
Well, the struct is right there so I figured the chances of changing the struct and not seeing that the compile-time init code needs to be changed too was small. I guess its better to be safe than sorry and it does make it more readable so I'll change it.
Quoted 2 lines
May I ask why you define separate types for the M41T81 and the M41T85, when you handle both exactly the same way?
The only reason is so that its obvious that both the t81 and t85 are supported. If I make it M41T81 only then I can easily see someone grep'ing around looking for M41T85, not finding it, and writing their own driver. I don't see any harm in having both, do you?
Quoted 8 lines
drivers/i2c/chips/m41t00.c
Quoted 6 lines
drivers/i2c/chips/m41t00.c +6
-0+ sec = buf[m41t00_chip->sec] &0x7f ; + min = buf[m41t00_chip->min] &0x7f ; + hour = buf[m41t00_chip->hour] &0x3f ; + day = buf[m41t00_chip->day] &0x3f ; + mon = buf[m41t00_chip->mon] &0x1f ; + year = buf[m41t00_chip->year] &0xff ;The year masking is a no-op, you could omit it.
Yes.
Quoted 13 lines
Quoted 13 lines
drivers/i2c/chips/m41t00.c +9
-0@@ -169,24 +246,100 @@ m41t00_probe(struct i2c_adapter *adap, i {struct i2c_client *client;int rc; +u8 rbuf[1 ], wbuf[2 ], msgbuf[1 ] = {0 };/* offset into rtc's regs */ +struct i2c_msg msgs[] = { + { + .addr =0 , + .flags =0 , + .len =1 , + .buf = msgbuf, + }, + {
Quoted 8 lines
drivers/i2c/chips/m41t00.c m41t00_probe(struct i2c_adapter *adap, i · line 263
Quoted 6 lines
drivers/i2c/chips/m41t00.c +6
-0+ .addr = 0, + .flags = I2C_M_RD, + .len = 1, + .buf = rbuf, + }, + };Why don't you initialize both .addr right away?
Actually, I already init the .addr field right away so I'll remove them from them from the code above.
Quoted 10 lines
drivers/i2c/chips/m41t00.c m41t00_probe(struct i2c_adapter *adap, i · line 268
Quoted 7 lines
drivers/i2c/chips/m41t00.c +1
-1client =kzalloc (sizeof (struct i2c_client ),GFP_KERNEL );if (!client)return -ENOMEM ; -strlcpy (client->name,M41T00_DRV_NAME ,I2C_NAME_SIZE ); +strlcpy (client->name, m41t00_driver.driver.name,I2C_NAME_SIZE );The driver name may not be suitable here, the client name should instead reflect what chip it is.
Ah, good one.
Quoted 11 lines
drivers/i2c/chips/m41t00.c m41t00_probe(struct i2c_adapter *adap, i · line 274
Quoted 6 lines
drivers/i2c/chips/m41t00.c +6
-0+if (m41t00_chip->type !=M41T00_TYPE_M41T00 ) { +/* If asked, set SQW frequency & enable */ +if (m41t00_chip->sqw_freq) { + msgbuf[0 ] = m41t00_chip->alarm_mon; +if ((rc =i2c_transfer (client->adapter, msgs,2 )) <0 ) + goto sqw_err;You did not check whether the adapter you are attaching to supports this kind of transaction! You need to call
i2c_check_functionality, see how other i2c chip drivers (for example ds1337) are doing. Fori2c_transferandi2c_master_send, you want to check forI2C_FUNC_I2C.
Okay.
Quoted 38 lines
Quoted 38 lines
drivers/i2c/chips/m41t00.c +38
-0+ + wbuf[0 ] = m41t00_chip->alarm_mon; + wbuf[1 ] = rbuf[0 ] & ~0x40 ; +if ((rc =i2c_master_send (client, wbuf,2 )) <0 ) + goto sqw_err; + + wbuf[0 ] = m41t00_chip->sqw; + wbuf[1 ] = m41t00_chip->sqw_freq; +if ((rc =i2c_master_send (client, wbuf,2 )) <0 ) + goto sqw_err; + + wbuf[0 ] = m41t00_chip->alarm_mon; + wbuf[1 ] = rbuf[0 ] |0x40 ; +if ((rc =i2c_master_send (client, wbuf,2 )) <0 ) + goto sqw_err; + } + +/* Make sure HT (Halt Update) bit is cleared */ + msgbuf[0 ] = m41t00_chip->alarm_hour; +if ((rc =i2c_transfer (client->adapter, msgs,2 )) <0 ) + goto ht_err; + +if (rbuf[0 ] &0x40 ) { + wbuf[0 ] = m41t00_chip->alarm_hour; + wbuf[1 ] = rbuf[0 ] & ~0x40 ; +if ((rc =i2c_master_send (client, wbuf,2 )) <0 ) + goto ht_err; + } + } + +/* Make sure ST (stop) bit is cleared */ + msgbuf[0 ] = m41t00_chip->sec; +if ((rc =i2c_transfer (client->adapter, msgs,2 )) <0 ) + goto st_err; + +if (rbuf[0 ] &0x80 ) { + wbuf[0 ] = m41t00_chip->sec; + wbuf[1 ] = rbuf[0 ] & ~0x80 ;
Quoted 8 lines
drivers/i2c/chips/m41t00.c m41t00_probe(struct i2c_adapter *adap, i · line 315
Quoted 3 lines
drivers/i2c/chips/m41t00.c +2
-0+if ((rc =i2c_master_send (client, wbuf,2 )) <0 ) + goto st_err; }What you do here are basically SMBus Read Byte and SMBus Write Byte transactions. The code would be much more simple if you were using the
i2c_smbus_read_byte_dataandi2c_smbus_write_byte_datafunctions, which take care of all the technical details.
That's true but I assumed that since I was using i2c_transfer earlier, I should use it here. Is that a bad assumption? I do see that ds1337.c uses both types.
Quoted 7 lines
Quoted 7 lines
drivers/i2c/chips/m41t00.c +7
-0+st_err: +dev_err (&client->dev,"m41t00_probe: Can't clear ST bit\n" ); + goto attach_err; +ht_err: +dev_err (&client->dev,"m41t00_probe: Can't clear HT bit\n" ); + goto attach_err; +sqw_err:
Quoted 8 lines
drivers/i2c/chips/m41t00.c m41t00_probe(struct i2c_adapter *adap, i · line 327
Quoted 5 lines
drivers/i2c/chips/m41t00.c +4
-0+dev_err (&client->dev,"m41t00_probe: Can't set SQW Frequency\n" ); +attach_err: +kfree (client); +return rc; }Mrghh, this isn't exactly elegant... You should be able to make it better if you switch to i2c_smbus_read/write_byte_data as suggested.
Yep.
Quoted 4 lines
Quoted 4 lines
diff -Nurp
linux-2.6.16-mm1-cleanup/include/linux/m41t00.hlinux-2.6.16-mm1-newsupp/include/linux/m41t00.hinclude/linux/m41t00.h +0
-0@@ -0,0 +1,50 @@
Quoted 8 lines
include/linux/m41t00.h line 6
Quoted 6 lines
include/linux/m41t00.h +6
-0+/* +* Definitions for the ST M41T00 family of i2c rtc chips. +* +* Author: Mark A. Greer <[email protected]> +* +* 2005 (c) MontaVista Software, Inc. This file is licensed under We're in year 2006 now :)
Yes, but my understanding is that I should leave the 2005 there b/c that file was already copyrighted with that year. I could do a "2005, 2006" if you like.
Quoted 11 lines
include/linux/m41t00.h line 15
Quoted 9 lines
include/linux/m41t00.h +9
-0+* the terms of the GNU General Public License version 2. This program +* is licensed "as is" without any warranty of any kind, whether express +* or implied. +*/ + +#ifndef _M41T00_H +#define _M41T00_H + +#define M41T00_DRV_NAME "m41t00"Why do you need to export this?
Because the code that passes the platform_data needs to put that name in the data so that the driver can find it. That's the value that the driver uses to search for its platform_data. I'll attach the patch to the platform code that I used to test it so you can see what I mean. Its at the end of this email.
Quoted 3 lines
include/linux/m41t00.h line 16
Quoted 1 line
include/linux/m41t00.h +1
-0+#define M41T00_I2C_ADDR 0x68Not used anywhere?
Yes, in the platform code.
Quoted 9 lines
include/linux/m41t00.h line 19
Quoted 3 lines
include/linux/m41t00.h +3
-0+#define M41T00_TYPE_M41T00 0 +#define M41T00_TYPE_M41T81 81 +#define M41T00_TYPE_M41T85 85The i2c core has a facility for drivers supporting several types of devices. Check for
I2C_CLIENT_INSMOD_3()in your case. The advantage if you go that way is that chip types can be set from userspace through module parameters, which may be convenient for testing when adding support for new platforms.
Okay, I'll take a look.
Quoted 12 lines
Quoted 12 lines
include/linux/m41t00.h +12
-0+/* SQW output disabled, this is default value by power on*/ +#define SQW_FREQ_DISABLE (0) + +#define SQW_FREQ_32KHZ (1<<4)/* 32.768 KHz */ +#define SQW_FREQ_8KHZ (2<<4)/* 8.192 KHz */ +#define SQW_FREQ_4KHZ (3<<4)/* 4.096 KHz */ +#define SQW_FREQ_2KHZ (4<<4)/* 2.048 KHz */ +#define SQW_FREQ_1KHZ (5<<4)/* 1.024 KHz */ +#define SQW_FREQ_512HZ (6<<4)/* 512 Hz */ +#define SQW_FREQ_256HZ (7<<4)/* 256 Hz */ +#define SQW_FREQ_128HZ (8<<4)/* 128 Hz */ +#define SQW_FREQ_64HZ (9<<4)/* 64 Hz */
Quoted 8 lines
include/linux/m41t00.h line 37
Quoted 6 lines
include/linux/m41t00.h +6
-0+#define SQW_FREQ_32HZ (10<<4)/* 32 Hz */ +#define SQW_FREQ_16HZ (11<<4)/* 16 Hz */ +#define SQW_FREQ_8HZ (12<<4)/* 8 Hz */ +#define SQW_FREQ_4HZ (13<<4)/* 4 Hz */ +#define SQW_FREQ_2HZ (14<<4)/* 2 Hz */ +#define SQW_FREQ_1HZ (15<<4)/* 1 Hz */ Not used anywhere either?
Platform code can pass one of these values into the driver via platform_data (if its a t81 or t85, not needed for the t00).
Quoted 7 lines
include/linux/m41t00.h line 39
Quoted 2 lines
include/linux/m41t00.h +2
-0+extern ulong m41t00_get_rtc_time (void ); +extern int m41t00_set_rtc_time (ulong nowtime);Hopefully you won't have to export these anymore after you move to the new RTC subsystem. But that's a different story. In the meantime, shouldn't you have
EXPORT_SYMBOL_GPL()for these functions? Else compiling m41t00 as a module won't work.
Good point. Will fix.
Below is the katana patch. Basically, it adds the platform_data required for the m41t00 rtc which the m41t00 driver later takes out. Note that the m41t00 doesn't need the sqw_freq value so you won't see it being set in this patch.
I did have a couple questions above so I'll wait for your response and then make a new patch.
Thanks for your time, Jean.
Mark
---
arch/ppc/platforms/katana.c +26 -2
@@ -28,6 +28,7 @@#include <linux/mtd/physmap.h> #include <linux/mv643xx.h> #include <linux/platform_device.h> +#include <linux/m41t00.h> #ifdef CONFIG_BOOTIMG #include <linux/bootimg.h> #endif
@@ -843,8 +844,31 @@ katana_find_end_of_memory(void) }#if defined(CONFIG_I2C_MV64XXX ) && defined(CONFIG_SENSORS_M41T00 ) -extern ulong m41t00_get_rtc_time (void ); -extern int m41t00_set_rtc_time (ulong ); +static struct m41t00_platform_data katana_m41t00_pdata = { + .type =M41T00_TYPE_M41T00 , + .i2c_addr =M41T00_I2C_ADDR , +}; + +static struct platform_device katana_m41t00_pdev = { + .name =M41T00_DRV_NAME , + .id =0 , + .num_resources =0 , + .dev = { + .platform_data = &katana_m41t00_pdata, + }, +}; + +static int __init +katana_add_pdata (void ) +{ +int rc; + +if ((rc =platform_device_register (&katana_m41t00_pdev))) +platform_device_unregister (&katana_m41t00_pdev); + +return rc; +} +arch_initcall (katana_add_pdata);static int __init katana_rtc_hookup (void )
Re: [PATCH 2.6.16-mm1 3/3] rtc: add support for m41t81 & m41t85 chips to m41t00 driver
Hi Mark,
Answering your questions before I forget about them and let a week pass again...
Anything I don't comment on, means that you were right and I agree with you.
Quoted 7 lines
Quoted 2 lines
May I ask why you define separate types for the M41T81 and the M41T85, when you handle both exactly the same way?
The only reason is so that its obvious that both the t81 and t85 are supported. If I make it M41T81 only then I can easily see someone grep'ing around looking for M41T85, not finding it, and writing their own driver. I don't see any harm in having both, do you?
It wastes some memory, and you may later fix something for the M41T81 and forget to fix it for the M41T85.
If your only concern is to help grepers, you can add a clear list of supported chips either as a comment at the top of the source file, or as Documentation/i2c/chips/m41t00. That's what we do for hardware monitoring chips.
No big deal anyway, so the decision is up to you.
Quoted 8 lines
Quoted 4 lines
What you do here are basically SMBus Read Byte and SMBus Write Byte transactions. The code would be much more simple if you were using the
i2c_smbus_read_byte_dataandi2c_smbus_write_byte_datafunctions, which take care of all the technical details.That's true but I assumed that since I was using
i2c_transferearlier, I should use it here. Is that a bad assumption? I do see thatds1337.cuses both types.
Bad assumption, indeed. Nothing prevents you from using the smbus functions and the i2c functions in the same driver, as long as your call to i2c_check_functionality covers every function you use. So, just use whatever makes your driver easier to write.
Thanks,
Signature · 1 line
Jean Delvare
Re: [PATCH 2.6.16-mm1 3/3] rtc: add support for m41t81 & m41t85 chips to m41t00 driver
Jean,
This is a complete replacement for the patch(es) with the same subject submitted previously. It is still against 2.6.16-mm1 but if you want it against 2.6.16-mm2, let me know.
I kept separate entries for t81 and t85 b/c I also added a string with the chip name. That string is copied into the client struct and is also used as the name of the workqueue thread.
I still have several error goto's in m41t00_probe(). If I don't, I either need to have a bunch of returns in that routine (frowned upon) or I have to get rid of the dev_err msgs which I think are useful. If you have a better way, let me know.
Other than that, I think I have addressed all of your concerns. Sorry for all of the iterations.
Mark
---
This patch adds support for the ST m41t81 and m41t85 i2c rtc chips to the existing m41t00 driver.
Since there is no way to reliably determine what type of rtc chip is in use, the chip type is passed in via platform_data. The i2c address and square wave frequency are passed in via platform_data as well. To accommodate the use of platform_data, a new header file include/linux/m41t00.h has been added.
The m41t81 and m41t85 chips halt the updating of their time registers while they are being accessed. They resume when a stop condition exists on the i2c bus or when non-time related regs are accessed. To make the best use of that facility and to make more efficient use of the i2c bus, this patch replaces multiple i2c_smbus_xxx calls with a single i2c_transfer call.
---
drivers/i2c/chips/m41t00.c | 320 ++++++++++++++++++++++++++++++++++----------- include/linux/m41t00.h | 50 +++++++ 2 files changed, 296 insertions(+), 74 deletions(-)
---
drivers/i2c/chips/m41t00.c +246 -74
@@ -1,9 +1,9 @@/* -* I2C client/driver for the ST M41T00 Real-Time Clock chip. +* I2C client/driver for the ST M41T00 family of i2c rtc chips. * * Author: Mark A. Greer <[email protected]> * -* 2005 (c) MontaVista Software, Inc. This file is licensed under +* 2005, 2006 (c) MontaVista Software, Inc. This file is licensed under * the terms of the GNU General Public License version 2. This program * is licensed "as is" without any warranty of any kind, whether express * or implied.
@@ -19,21 +19,17 @@#include <linux/i2c.h> #include <linux/rtc.h> #include <linux/bcd.h> -#include <linux/mutex.h> #include <linux/workqueue.h> - +#include <linux/platform_device.h> +#include <linux/m41t00.h> #include <asm/time.h> #include <asm/rtc.h> -#define M41T00_DRV_NAME "m41t00" - -static DEFINE_MUTEX (m41t00_mutex); -static struct i2c_driver m41t00_driver;static struct i2c_client *save_client;static unsigned short ignore[] = {I2C_CLIENT_END }; -static unsigned short normal_addr[] = {0x68 ,I2C_CLIENT_END }; +static unsigned short normal_addr[] = {I2C_CLIENT_END ,I2C_CLIENT_END };static struct i2c_client_address_data addr_data = { .normal_i2c = normal_addr,
@@ -41,34 +37,92 @@ static struct i2c_client_address_data ad .ignore = ignore, }; +struct m41t00_chip_info { +u8 type; +char *name; +u8 read_limit; +u8 sec;/* Offsets for chip regs */ +u8 min; +u8 hour; +u8 day; +u8 mon; +u8 year; +u8 alarm_mon; +u8 alarm_hour; +u8 sqw; +u8 sqw_freq; +}; + +static struct m41t00_chip_info m41t00_chip_info_tbl[] = { + { + .type =M41T00_TYPE_M41T00 , + .name ="m41t00" , + .read_limit =5 , + .sec =0 , + .min =1 , + .hour =2 , + .day =4 , + .mon =5 , + .year =6 , + }, + { + .type =M41T00_TYPE_M41T81 , + .name ="m41t81" , + .read_limit =1 , + .sec =1 , + .min =2 , + .hour =3 , + .day =5 , + .mon =6 , + .year =7 , + .alarm_mon =0xa , + .alarm_hour =0xc , + .sqw =0x13 , + }, + { + .type =M41T00_TYPE_M41T85 , + .name ="m41t85" , + .read_limit =1 , + .sec =1 , + .min =2 , + .hour =3 , + .day =5 , + .mon =6 , + .year =7 , + .alarm_mon =0xa , + .alarm_hour =0xc , + .sqw =0x13 , + }, +}; +static struct m41t00_chip_info *m41t00_chip; +ulong m41t00_get_rtc_time (void ) {s32 sec, min, hour, day, mon, year;s32 sec1, min1, hour1, day1, mon1, year1; -ulong limit =10 ; +u8 reads =0 ; +u8 buf[8 ], msgbuf[1 ] = {0 };/* offset into rtc's regs */ +struct i2c_msg msgs[] = { + { + .addr = save_client->addr, + .flags =0 , + .len =1 , + .buf = msgbuf, + }, + { + .addr = save_client->addr, + .flags =I2C_M_RD , + .len =8 , + .buf = buf, + }, + }; sec = min = hour = day = mon = year =0 ; - sec1 = min1 = hour1 = day1 = mon1 = year1 =0 ; -mutex_lock (&m41t00_mutex); do { - if (((sec = i2c_smbus_read_byte_data(save_client, 0)) >= 0) - && ((min = i2c_smbus_read_byte_data(save_client, 1)) - >= 0) - && ((hour = i2c_smbus_read_byte_data(save_client, 2)) - >= 0) - && ((day = i2c_smbus_read_byte_data(save_client, 4)) - >= 0) - && ((mon = i2c_smbus_read_byte_data(save_client, 5)) - >= 0) - && ((year = i2c_smbus_read_byte_data(save_client, 6)) - >= 0) - && ((sec == sec1) && (min == min1) && (hour == hour1) - && (day == day1) && (mon == mon1) - && (year == year1))) - - break; + if (i2c_transfer(save_client->adapter, msgs, 2) < 0) + goto read_err; sec1 = sec; min1 = min;
@@ -76,21 +130,21 @@ m41t00_get_rtc_time(void) day1 = day; mon1 = mon; year1 = year; - }while (--limit >0 ); -mutex_unlock (&m41t00_mutex); - -if (limit ==0 ) { -dev_warn (&save_client->dev, -"m41t00: can't read rtc chip\n" ); - sec = min = hour = day = mon = year =0 ; - } - sec &=0x7f ; - min &=0x7f ; - hour &=0x3f ; - day &=0x3f ; - mon &=0x1f ; - year &=0xff ; + sec = buf[m41t00_chip->sec] &0x7f ; + min = buf[m41t00_chip->min] &0x7f ; + hour = buf[m41t00_chip->hour] &0x3f ; + day = buf[m41t00_chip->day] &0x3f ; + mon = buf[m41t00_chip->mon] &0x1f ; + year = buf[m41t00_chip->year]; + }while ((++reads < m41t00_chip->read_limit) && ((sec != sec1) + || (min != min1) || (hour != hour1) || (day != day1) + || (mon != mon1) || (year != year1))); + +if ((m41t00_chip->read_limit >1 ) && ((sec != sec1) || (min != min1) + || (hour != hour1) || (day != day1) || (mon != mon1) + || (year != year1))) + goto read_err; sec =BCD2BIN (sec); min =BCD2BIN (min);
@@ -104,40 +158,60 @@ m41t00_get_rtc_time(void) year +=100 ;return mktime (year, mon, day, hour, min, sec); + +read_err: +dev_err (&save_client->dev,"m41t00_get_rtc_time: Read error\n" ); +return 0 ; } +EXPORT_SYMBOL_GPL (m41t00_get_rtc_time);static void m41t00_set (void *arg) {struct rtc_time tm; -ulong nowtime = *(ulong *)arg; +int nowtime = *(int *)arg; +s32 sec, min, hour, day, mon, year; +u8 wbuf[9 ], *buf = &wbuf[1 ], msgbuf[1 ] = {0 }; +struct i2c_msg msgs[] = { + { + .addr = save_client->addr, + .flags =0 , + .len =1 , + .buf = msgbuf, + }, + { + .addr = save_client->addr, + .flags =I2C_M_RD , + .len =8 , + .buf = buf, + }, + };to_tm (nowtime, &tm); tm.tm_year = (tm.tm_year -1900 ) %100 ; - tm.tm_sec =BIN2BCD (tm.tm_sec); - tm.tm_min =BIN2BCD (tm.tm_min); - tm.tm_hour =BIN2BCD (tm.tm_hour); - tm.tm_mon =BIN2BCD (tm.tm_mon); - tm.tm_mday =BIN2BCD (tm.tm_mday); - tm.tm_year =BIN2BCD (tm.tm_year); - -mutex_lock (&m41t00_mutex); -if ((i2c_smbus_write_byte_data (save_client,0 , tm.tm_sec &0x7f ) <0 ) - || (i2c_smbus_write_byte_data (save_client,1 , tm.tm_min &0x7f ) - <0 ) - || (i2c_smbus_write_byte_data (save_client,2 , tm.tm_hour &0x7f ) - <0 ) - || (i2c_smbus_write_byte_data (save_client,4 , tm.tm_mday &0x7f ) - <0 ) - || (i2c_smbus_write_byte_data (save_client,5 , tm.tm_mon &0x7f ) - <0 ) - || (i2c_smbus_write_byte_data (save_client,6 , tm.tm_year &0x7f ) - <0 )) + sec =BIN2BCD (tm.tm_sec); + min =BIN2BCD (tm.tm_min); + hour =BIN2BCD (tm.tm_hour); + day =BIN2BCD (tm.tm_mday); + mon =BIN2BCD (tm.tm_mon); + year =BIN2BCD (tm.tm_year); + +/* Read reg values into buf[0..7]/wbuf[1..8] */ +if (i2c_transfer (save_client->adapter, msgs,2 ) <0 ) { +dev_err (&save_client->dev,"m41t00_set: Read error\n" ); +return ; + } -dev_warn (&save_client->dev,"m41t00: can't write to rtc chip\n" ); + wbuf[0 ] =0 ;/* offset into rtc's regs */ + buf[m41t00_chip->sec] = (buf[m41t00_chip->sec] & ~0x7f ) | (sec &0x7f ); + buf[m41t00_chip->min] = (buf[m41t00_chip->min] & ~0x7f ) | (min &0x7f ); + buf[m41t00_chip->hour] = (buf[m41t00_chip->hour]& ~0x3f ) | (hour&0x3f ); + buf[m41t00_chip->day] = (buf[m41t00_chip->day] & ~0x3f ) | (day &0x3f ); + buf[m41t00_chip->mon] = (buf[m41t00_chip->mon] & ~0x1f ) | (mon &0x1f ); -mutex_unlock (&m41t00_mutex); +if (i2c_master_send (save_client, wbuf,9 ) <0 ) +dev_err (&save_client->dev,"m41t00_set: Write error\n" ); }static ulong new_time;
@@ -156,6 +230,48 @@ m41t00_set_rtc_time(ulong nowtime)return 0 ; } +EXPORT_SYMBOL_GPL (m41t00_set_rtc_time); + +/* +***************************************************************************** +* +* platform_data Driver Interface +* +***************************************************************************** +*/ +static int __init +m41t00_platform_probe (struct platform_device *pdev) +{ +struct m41t00_platform_data *pdata; +int i; + +if (pdev && (pdata = pdev->dev.platform_data)) { + normal_addr[0 ] = pdata->i2c_addr; + +for (i=0 ; i<ARRAY_SIZE (m41t00_chip_info_tbl); i++) +if (m41t00_chip_info_tbl[i].type == pdata->type) { + m41t00_chip = &m41t00_chip_info_tbl[i]; + m41t00_chip->sqw_freq = pdata->sqw_freq; +return 0 ; + } + } +return -ENODEV ; +} + +static int __exit +m41t00_platform_remove (struct platform_device *pdev) +{ +return 0 ; +} + +static struct platform_driver m41t00_platform_driver = { + .probe = m41t00_platform_probe, + .remove = m41t00_platform_remove, + .driver = { + .owner =THIS_MODULE , + .name =M41T00_DRV_NAME , + }, +};/* *****************************************************************************
@@ -168,25 +284,76 @@ static int m41t00_probe(struct i2c_adapter *adap, int addr, int kind) { struct i2c_client *client; -int rc; +int rc = -EINVAL ; - client =kzalloc (sizeof (struct i2c_client ),GFP_KERNEL ); -if (!client) -return -ENOMEM ; +if (!i2c_check_functionality (adap,I2C_FUNC_I2C + |I2C_FUNC_SMBUS_BYTE_DATA )) + goto early_err; + +if (!(client =kzalloc (sizeof (struct i2c_client ),GFP_KERNEL ))) { + rc = -ENOMEM ; + goto early_err; + } -strlcpy (client->name,M41T00_DRV_NAME ,I2C_NAME_SIZE ); +strlcpy (client->name, m41t00_chip->name,I2C_NAME_SIZE ); client->addr = addr; client->adapter = adap; client->driver = &m41t00_driver; -if ((rc =i2c_attach_client (client)) !=0 ) { -kfree (client); -return rc; +if ((rc =i2c_attach_client (client))) + goto attach_err; + +if (m41t00_chip->type !=M41T00_TYPE_M41T00 ) { +/* If asked, disable SQW, set SQW frequency & re-enable */ +if (m41t00_chip->sqw_freq) +if (((rc =i2c_smbus_read_byte_data (client, + m41t00_chip->alarm_mon)) <0 ) + || ((rc =i2c_smbus_write_byte_data (client, + m41t00_chip->alarm_mon, rc & ~0x40 )) <0 ) + || ((rc =i2c_smbus_write_byte_data (client, + m41t00_chip->sqw, + m41t00_chip->sqw_freq)) <0 ) + || ((rc =i2c_smbus_write_byte_data (client, + m41t00_chip->alarm_mon, rc |0x40 )) <0 )) + + goto sqw_err; + +/* Make sure HT (Halt Update) bit is cleared */ +if ((rc =i2c_smbus_read_byte_data (client, + m41t00_chip->alarm_hour)) <0 ) + goto ht_err; + +if (rc &0x40 ) +if ((rc =i2c_smbus_write_byte_data (client, + m41t00_chip->alarm_hour, rc & ~0x40 ))<0 ) + goto ht_err; } - m41t00_wq =create_singlethread_workqueue ("m41t00" ); +/* Make sure ST (stop) bit is cleared */ +if ((rc =i2c_smbus_read_byte_data (client, m41t00_chip->sec)) <0 ) + goto st_err; + +if (rc &0x80 ) +if ((rc =i2c_smbus_write_byte_data (client, m41t00_chip->sec, + rc & ~0x80 )) <0 ) + goto st_err; + + m41t00_wq =create_singlethread_workqueue (m41t00_chip->name); save_client = client;return 0 ; + +st_err: +dev_err (&client->dev,"m41t00_probe: Can't clear ST bit\n" ); + goto attach_err; +ht_err: +dev_err (&client->dev,"m41t00_probe: Can't clear HT bit\n" ); + goto attach_err; +sqw_err: +dev_err (&client->dev,"m41t00_probe: Can't set SQW Frequency\n" ); +attach_err: +kfree (client); +early_err: +return rc; } static int
@@ -219,13 +386,18 @@ static struct i2c_driver m41t00_driver =static int __init m41t00_init (void ) { -return i2c_add_driver (&m41t00_driver); +int rc; + +if (!(rc =platform_driver_register (&m41t00_platform_driver))) + rc =i2c_add_driver (&m41t00_driver); +return rc; } static void __exitm41t00_exit (void ) {i2c_del_driver (&m41t00_driver); +platform_driver_unregister (&m41t00_platform_driver); }module_init (m41t00_init);
include/linux/m41t00.h +50 -0
50 lines not on this page · raw message
Re: [PATCH 2.6.16-mm1 3/3] rtc: add support for m41t81 & m41t85 chips to m41t00 driver
Hi Mark,
Quoted 7 lines
This is a complete replacement for the patch(es) with the same subject submitted previously. It is still against 2.6.16-mm1 but if you want it against 2.6.16-mm2, let me know.
I kept separate entries for t81 and t85 b/c I also added a string with the chip name. That string is copied into the client struct and is also used as the name of the workqueue thread.
Fine with me.
Quoted 4 lines
I still have several error goto's in
m41t00_probe(). If I don't, I either need to have a bunch of returns in that routine (frowned upon) or I have to get rid of thedev_errmsgs which I think are useful. If you have a better way, let me know.
No immediate idea and I don't quite have the time to work on it. If anyone is unhappy with it, that person gets to suggest a better way ;)
Quoted 2 lines
Other than that, I think I have addressed all of your concerns. Sorry for all of the iterations.
No worry about the iterations, good patches go that path, methinks. And I take my part of responsability for the slow processing.
I'm fine with almost everything now, except for a couple things below, which I'll change myself if you're OK with my suggestions, before pushing the patch upwards:
drivers/i2c/chips/m41t00.c static int · line 291
Quoted 12 lines
m41t00_probe(struct i2c_adapter *adap, int addr, int kind){drivers/i2c/chips/m41t00.c +4
-4struct i2c_client *client; -int rc; +int rc = -EINVAL ; - client =kzalloc (sizeof (struct i2c_client ),GFP_KERNEL ); -if (!client) -return -ENOMEM ; +if (!i2c_check_functionality (adap,I2C_FUNC_I2C + |I2C_FUNC_SMBUS_BYTE_DATA )) + goto early_err;
Good check, but bad return value, given the way the i2c subsystem works for now. There is no error at this point, your i2c driver is simply not compatible with one of the i2c busses which exist on the system. You must return 0 (no error.)
drivers/i2c/chips/m41t00.c static int · line 296
Quoted 5 lines
drivers/i2c/chips/m41t00.c +5
-0+ +if (!(client =kzalloc (sizeof (struct i2c_client ),GFP_KERNEL ))) { + rc = -ENOMEM ; + goto early_err; + }
And this change doesn't really win anything compared to the original code. So I'd suggest:
@@ -170,23 +286,72 @@
struct i2c_client *client;
int rc;
+ if (!i2c_check_functionality(adap, I2C_FUNC_I2C
+ | I2C_FUNC_SMBUS_BYTE_DATA))
+ return 0;
+
client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); if (!client)
return -ENOMEM;
This minimizes the changes while doing the right thing.
include/linux/m41t00.h line 6
Quoted 9 lines
include/linux/m41t00.h +6
-0@@ -0,0 +1,50 @@ +/* +* Definitions for the ST M41T00 family of i2c rtc chips. +* +* Author: Mark A. Greer <mgreer at mvista.com> +* +* 2005 (c) MontaVista Software, Inc. This file is licensed under
Still no 2006? You added it to the driver file so I guess you want to do the same here.
Quoted 8 lines
include/linux/m41t00.h +8
-0+/* SQW output disabled, this is default value by power on*/ +#define SQW_FREQ_DISABLE (0) + +#define SQW_FREQ_32KHZ (1<<4)/* 32.768 KHz */ +#define SQW_FREQ_8KHZ (2<<4)/* 8.192 KHz */ +#define SQW_FREQ_4KHZ (3<<4)/* 4.096 KHz */ +#define SQW_FREQ_2KHZ (4<<4)/* 2.048 KHz */ +#define SQW_FREQ_1KHZ (5<<4)/* 1.024 KHz */
include/linux/m41t00.h line 45
Quoted 10 lines
include/linux/m41t00.h +10
-0+#define SQW_FREQ_512HZ (6<<4)/* 512 Hz */ +#define SQW_FREQ_256HZ (7<<4)/* 256 Hz */ +#define SQW_FREQ_128HZ (8<<4)/* 128 Hz */ +#define SQW_FREQ_64HZ (9<<4)/* 64 Hz */ +#define SQW_FREQ_32HZ (10<<4)/* 32 Hz */ +#define SQW_FREQ_16HZ (11<<4)/* 16 Hz */ +#define SQW_FREQ_8HZ (12<<4)/* 8 Hz */ +#define SQW_FREQ_4HZ (13<<4)/* 4 Hz */ +#define SQW_FREQ_2HZ (14<<4)/* 2 Hz */ +#define SQW_FREQ_1HZ (15<<4)/* 1 Hz */
It just hit me that, given that these defines are in a header file, they should have a M41T00_ prefix. Don't you think? If so, in order not to make the symbol names too long, we can probably remove the FREQ part, which doesn't really add anything. So I'd go with:
+/* SQW output disabled, this is default value by power on */
+#define M41T00_SQW_DISABLE (0)
+
+#define M41T00_SQW_32KHZ (1<<4) /* 32.768 KHz */
+#define M41T00_SQW_8KHZ (2<<4) /* 8.192 KHz */ +#define M41T00_SQW_4KHZ (3<<4) /* 4.096 KHz */ +#define M41T00_SQW_2KHZ (4<<4) /* 2.048 KHz */ +#define M41T00_SQW_1KHZ (5<<4) /* 1.024 KHz */ +#define M41T00_SQW_512HZ (6<<4) /* 512 Hz */ +#define M41T00_SQW_256HZ (7<<4) /* 256 Hz */ +#define M41T00_SQW_128HZ (8<<4) /* 128 Hz */ +#define M41T00_SQW_64HZ (9<<4) /* 64 Hz */ +#define M41T00_SQW_32HZ (10<<4) /* 32 Hz */ +#define M41T00_SQW_16HZ (11<<4) /* 16 Hz */ +#define M41T00_SQW_8HZ (12<<4) /* 8 Hz */ +#define M41T00_SQW_4HZ (13<<4) /* 4 Hz */ +#define M41T00_SQW_2HZ (14<<4) /* 2 Hz */ +#define M41T00_SQW_1HZ (15<<4) /* 1 Hz */
That's it. If you're OK with my changes, just tell so and we go with my version. If anything isn't OK, no problem, but then you get to resend a full patch with everything the way you want.
Thanks,
Signature · 1 line
Jean Delvare
Re: [PATCH 2.6.16-mm1 3/3] rtc: add support for m41t81 & m41t85 chips to m41t00 driver
Hi Jean,
On Sat, Apr 01, 2006 at 07:20:40PM +0200, Jean Delvare wrote:
<snip>
Quoted 6 lines
Quoted 3 lines
I either need to have a bunch of returns in that routine (frowned upon) or I have to get rid of the
dev_errmsgs which I think are useful. If you have a better way, let me know.No immediate idea and I don't quite have the time to work on it. If anyone is unhappy with it, that person gets to suggest a better way ;)
Works for me!
Quoted 49 lines
Quoted 2 lines
Other than that, I think I have addressed all of your concerns. Sorry for all of the iterations.
No worry about the iterations, good patches go that path, methinks. And I take my part of responsability for the slow processing.
I'm fine with almost everything now, except for a couple things below, which I'll change myself if you're OK with my suggestions, before pushing the patch upwards:
drivers/i2c/chips/m41t00.c static int · line 291
Quoted 12 lines
m41t00_probe(struct i2c_adapter *adap, int addr, int kind){drivers/i2c/chips/m41t00.c +4
-4struct i2c_client *client; -int rc; +int rc = -EINVAL ; - client =kzalloc (sizeof (struct i2c_client ),GFP_KERNEL ); -if (!client) -return -ENOMEM ; +if (!i2c_check_functionality (adap,I2C_FUNC_I2C + |I2C_FUNC_SMBUS_BYTE_DATA )) + goto early_err;Good check, but bad return value, given the way the i2c subsystem works for now. There is no error at this point, your i2c driver is simply not compatible with one of the i2c busses which exist on the system. You must return 0 (no error.)
drivers/i2c/chips/m41t00.c static int · line 296
Quoted 5 lines
drivers/i2c/chips/m41t00.c +5
-0+ +if (!(client =kzalloc (sizeof (struct i2c_client ),GFP_KERNEL ))) { + rc = -ENOMEM ; + goto early_err; + }And this change doesn't really win anything compared to the original code. So I'd suggest:
drivers/i2c/chips/m41t00.c +4
-0@@ -170,23 +286,72 @@struct i2c_client *client;int rc; +if (!i2c_check_functionality (adap,I2C_FUNC_I2C + |I2C_FUNC_SMBUS_BYTE_DATA )) +return 0 ; + client =kzalloc (sizeof (struct i2c_client ),GFP_KERNEL );if (!client)return -ENOMEM ;
Quoted 1 line
This minimizes the changes while doing the right thing.
I'm happy with that.
Quoted 4 lines
Quoted 4 lines
include/linux/m41t00.h +1
-0@@ -0,0 +1,50 @@ +/*
Quoted 8 lines
include/linux/m41t00.h line 6
Quoted 5 lines
include/linux/m41t00.h +5
-0+* Definitions for the ST M41T00 family of i2c rtc chips. +* +* Author: Mark A. Greer <[email protected]> +* +* 2005 (c) MontaVista Software, Inc. This file is licensed under Still no 2006? You added it to the driver file so I guess you want to do the same here.
Oops, missed that one. My bad.
Quoted 13 lines
Quoted 13 lines
include/linux/m41t00.h +13
-0+/* SQW output disabled, this is default value by power on*/ +#define SQW_FREQ_DISABLE (0) + +#define SQW_FREQ_32KHZ (1<<4)/* 32.768 KHz */ +#define SQW_FREQ_8KHZ (2<<4)/* 8.192 KHz */ +#define SQW_FREQ_4KHZ (3<<4)/* 4.096 KHz */ +#define SQW_FREQ_2KHZ (4<<4)/* 2.048 KHz */ +#define SQW_FREQ_1KHZ (5<<4)/* 1.024 KHz */ +#define SQW_FREQ_512HZ (6<<4)/* 512 Hz */ +#define SQW_FREQ_256HZ (7<<4)/* 256 Hz */ +#define SQW_FREQ_128HZ (8<<4)/* 128 Hz */ +#define SQW_FREQ_64HZ (9<<4)/* 64 Hz */ +#define SQW_FREQ_32HZ (10<<4)/* 32 Hz */
Quoted 8 lines
include/linux/m41t00.h line 45
Quoted 5 lines
include/linux/m41t00.h +5
-0+#define SQW_FREQ_16HZ (11<<4)/* 16 Hz */ +#define SQW_FREQ_8HZ (12<<4)/* 8 Hz */ +#define SQW_FREQ_4HZ (13<<4)/* 4 Hz */ +#define SQW_FREQ_2HZ (14<<4)/* 2 Hz */ +#define SQW_FREQ_1HZ (15<<4)/* 1 Hz */ It just hit me that, given that these defines are in a header file, they should have a
M41T00_prefix. Don't you think?
I agree.
Quoted 23 lines
If so, in order not
to make the symbol names too long, we can probably remove the FREQ part, which doesn't really add anything. So I'd go with:(quoted diff) +18
-0+/* SQW output disabled, this is default value by power on */ +#define M41T00_SQW_DISABLE (0) + +#define M41T00_SQW_32KHZ (1<<4) /* 32.768 KHz */ +#define M41T00_SQW_8KHZ (2<<4) /* 8.192 KHz */ +#define M41T00_SQW_4KHZ (3<<4) /* 4.096 KHz */ +#define M41T00_SQW_2KHZ (4<<4) /* 2.048 KHz */ +#define M41T00_SQW_1KHZ (5<<4) /* 1.024 KHz */ +#define M41T00_SQW_512HZ (6<<4) /* 512 Hz */ +#define M41T00_SQW_256HZ (7<<4) /* 256 Hz */ +#define M41T00_SQW_128HZ (8<<4) /* 128 Hz */ +#define M41T00_SQW_64HZ (9<<4) /* 64 Hz */ +#define M41T00_SQW_32HZ (10<<4) /* 32 Hz */ +#define M41T00_SQW_16HZ (11<<4) /* 16 Hz */ +#define M41T00_SQW_8HZ (12<<4) /* 8 Hz */ +#define M41T00_SQW_4HZ (13<<4) /* 4 Hz */ +#define M41T00_SQW_2HZ (14<<4) /* 2 Hz */ +#define M41T00_SQW_1HZ (15<<4) /* 1 Hz */
Quoted 3 lines
That's it. If you're OK with my changes, just tell so and we go with my version. If anything isn't OK, no problem, but then you get to resend a full patch with everything the way you want.
I'm happy with all your changes. Thanks again for you time, Jean.
Mark
PATCH 1/1 i2c: m41txx driver for ST i2c RTC chips
In reply to Mark A. GreerQuoted 7 lines
Quoted 6 lines
I still have a problem with your patch (sorry). It's really doing to many things at once. Namely, it adds support for new chips, converts from tasklet to workqueue, cleans up a few things (e.g. BIN2BCD instead of
BIN_TO_BCD, which is a good move), and also includes some whitespace changes (some of which is NOT OK, please don't attempt to align equal signs with spaces in regular code!)
Quoted 7 lines
You mean things like the following?
sec = buf[m41t00_chip->sec] & 0x7f; min = buf[m41t00_chip->min] & 0x7f; hour = buf[m41t00_chip->hour] & 0x3f;I just want to make sure I change the right code.
Yes, this is the kind of thing I was referring to.
Thanks,
Signature · 1 line
Jean Delvare
PATCH 1/1 i2c: m41txx driver for ST i2c RTC chips
In reply to Mark A. GreerQuoted 7 lines · Mark A. Greer
Quoted 2 lines · Jean Delvare
I know it means more work for you and I'm sorry about that, but it's also the only way for me to give proper review to all the changes.
No problem, Jean. Thanks for the comments. I'll post the new patches asap.
Okay, they're done. I've broken the patch up and I will submit them in subsequent emails. I will give each of them a unique subject to reply to this thread so you mail client should still be able to thread them.
Mark