rtc: add m41t62 support to rtc-m41t80 driver
Subsystems (2)
PATCH 1/3 rtc: add m41t62 support to rtc-m41t80 driver
Compared to the other supported chips, the m41t62 uses a different register to set the square wave frequency.
Signed-off-by Daniel Glöckner <[email protected]>
--- drivers/rtc/Kconfig | 4 ++-- drivers/rtc/rtc-m41t80.c | 18 +++++++++++++----- 2 files changed, 15 insertions(+), 7 deletions(-)
drivers/rtc/Kconfig +2 -2
@@ -224,11 +224,11 @@ config RTC_DRV_PCF8583 will be called rtc-pcf8583. config RTC_DRV_M41T80 - tristate "ST M41T65/M41T80/81/82/83/84/85/87" + tristate "ST M41T62/65/M41T80/81/82/83/84/85/87" help If you say Y here you will get support for the ST M41T60 and M41T80 RTC chips series. Currently, the following chips are - supported: M41T65, M41T80, M41T81, M41T82, M41T83, M41ST84, + supported: M41T62, M41T65, M41T80, M41T81, M41T82, M41T83, M41ST84, M41ST85, and M41ST87. This driver can also be built as a module. If so, the module
drivers/rtc/rtc-m41t80.c +13 -5
@@ -64,10 +64,12 @@#define M41T80_FEATURE_BL (1 << 1)/* Battery low indicator */ #define M41T80_FEATURE_SQ (1 << 2)/* Squarewave feature */ #define M41T80_FEATURE_WD (1 << 3)/* Extra watchdog resolution */ +#define M41T80_FEATURE_SQ_ALT (1 << 4)/* RSx bits are in reg 4 */ #define DRV_VERSION "0.05"static const struct i2c_device_id m41t80_id[] = { + {"m41t62" ,M41T80_FEATURE_SQ |M41T80_FEATURE_SQ_ALT }, {"m41t65" ,M41T80_FEATURE_HT |M41T80_FEATURE_WD }, {"m41t80" ,M41T80_FEATURE_SQ }, {"m41t81" ,M41T80_FEATURE_HT |M41T80_FEATURE_SQ },
@@ -393,12 +395,15 @@ static ssize_t m41t80_sysfs_show_sqwfreq(struct device *dev, {struct i2c_client *client =to_i2c_client (dev);struct m41t80_data *clientdata =i2c_get_clientdata (client); -int val; +int val, reg_sqw;if (!(clientdata->features &M41T80_FEATURE_SQ ))return -EINVAL ; - val =i2c_smbus_read_byte_data (client,M41T80_REG_SQW ); + reg_sqw =M41T80_REG_SQW ; +if (clientdata->features &M41T80_FEATURE_SQ_ALT ) + reg_sqw =M41T80_REG_WDAY ; + val =i2c_smbus_read_byte_data (client, reg_sqw);if (val <0 )return -EIO ; val = (val >>4 ) &0xf ;
@@ -419,7 +424,7 @@ static ssize_t m41t80_sysfs_set_sqwfreq(struct device *dev, {struct i2c_client *client =to_i2c_client (dev);struct m41t80_data *clientdata =i2c_get_clientdata (client); -int almon, sqw; +int almon, sqw, reg_sqw;int val =simple_strtoul (buf,NULL ,0 );if (!(clientdata->features &M41T80_FEATURE_SQ ))
@@ -440,13 +445,16 @@ static ssize_t m41t80_sysfs_set_sqwfreq(struct device *dev, almon =i2c_smbus_read_byte_data (client,M41T80_REG_ALARM_MON );if (almon <0 )return -EIO ; - sqw =i2c_smbus_read_byte_data (client,M41T80_REG_SQW ); + reg_sqw =M41T80_REG_SQW ; +if (clientdata->features &M41T80_FEATURE_SQ_ALT ) + reg_sqw =M41T80_REG_WDAY ; + sqw =i2c_smbus_read_byte_data (client, reg_sqw);if (sqw <0 )return -EIO ; sqw = (sqw &0x0f ) | (val <<4 );if (i2c_smbus_write_byte_data (client,M41T80_REG_ALARM_MON , almon & ~M41T80_ALMON_SQWE ) <0 || -i2c_smbus_write_byte_data (client,M41T80_REG_SQW , sqw) <0 ) +i2c_smbus_write_byte_data (client, reg_sqw, sqw) <0 )return -EIO ;if (val &&i2c_smbus_write_byte_data (client,M41T80_REG_ALARM_MON , almon |M41T80_ALMON_SQWE ) <0 )
Signature · 1 line
1.6.2.107.ge47ee
PATCH 2/3 xtensa: add m41t62 rtc to s6105 platform
Signed-off-by Daniel Glöckner <[email protected]>
--- arch/xtensa/platforms/s6105/device.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
arch/xtensa/platforms/s6105/device.c +3 -0
@@ -192,6 +192,9 @@ static struct i2c_board_info __initdata s6_i2c_devices[] = { {I2C_BOARD_INFO ("24c02" ,S6I2C_ADDR_AT24HC02B ), }, + { + I2C_BOARD_INFO("m41t62", S6I2C_ADDR_M41T62), + }, }; static struct resource s6_isef_resource[] = {
Signature · 1 line
1.6.2.107.ge47ee
PATCH 3/3 xtensa: enable m41t80 driver in s6105_defconfig
In reply to Daniel GlöcknerSigned-off-by Daniel Glöckner <[email protected]>
--- arch/xtensa/configs/s6105_defconfig | 56 +++++++++++++++++++++++++++++++++-- 1 files changed, 53 insertions(+), 3 deletions(-)
arch/xtensa/configs/s6105_defconfig +53 -3
@@ -363,8 +363,6 @@ CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set -# CONFIG_RTC is not set -# CONFIG_GEN_RTC is not set # CONFIG_R3964 is not set # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set
@@ -529,7 +527,59 @@ CONFIG_MMC_SPI=y # CONFIG_MEMSTICK is not set # CONFIG_NEW_LEDS is not set # CONFIG_ACCESSIBILITY is not set -# CONFIG_RTC_CLASS is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +# CONFIG_RTC_INTF_SYSFS is not set +# CONFIG_RTC_INTF_PROC is not set +# CONFIG_RTC_INTF_DEV is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1374 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +CONFIG_RTC_DRV_M41T80=y +# CONFIG_RTC_DRV_M41T80_WDT is not set +# CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set +# CONFIG_RTC_DRV_RX8581 is not set + +# +# SPI RTC drivers +# + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# # CONFIG_DMADEVICES is not set # CONFIG_UIO is not set # CONFIG_STAGING is not set
Signature · 1 line
1.6.2.107.ge47ee