diff options
author | Wolfram Sang <wsa@sang-engineering.com> | 2014-06-06 17:35:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-06 19:08:07 -0400 |
commit | 6b1a5235498d6002d40cb0503365154e49c53122 (patch) | |
tree | 34cdcaf94e5efb2e2c51a7e7363252067171a19d /drivers/rtc | |
parent | 85d77047c4eaa247bc19a581dba968571dd87e55 (diff) |
drivers/rtc/rtc-m41t80.c: add support for MicroCrystal rv4162
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Cc: Jingoo Han <jg1.han@samsung.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc')
-rw-r--r-- | drivers/rtc/Kconfig | 4 | ||||
-rw-r--r-- | drivers/rtc/rtc-m41t80.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index ac4fa56280cd..f4e113874e7a 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig | |||
@@ -386,12 +386,12 @@ config RTC_DRV_PCF8583 | |||
386 | will be called rtc-pcf8583. | 386 | will be called rtc-pcf8583. |
387 | 387 | ||
388 | config RTC_DRV_M41T80 | 388 | config RTC_DRV_M41T80 |
389 | tristate "ST M41T62/65/M41T80/81/82/83/84/85/87" | 389 | tristate "ST M41T62/65/M41T80/81/82/83/84/85/87 and compatible" |
390 | help | 390 | help |
391 | If you say Y here you will get support for the ST M41T60 | 391 | If you say Y here you will get support for the ST M41T60 |
392 | and M41T80 RTC chips series. Currently, the following chips are | 392 | and M41T80 RTC chips series. Currently, the following chips are |
393 | supported: M41T62, M41T65, M41T80, M41T81, M41T82, M41T83, M41ST84, | 393 | supported: M41T62, M41T65, M41T80, M41T81, M41T82, M41T83, M41ST84, |
394 | M41ST85, and M41ST87. | 394 | M41ST85, M41ST87, and MicroCrystal RV4162. |
395 | 395 | ||
396 | This driver can also be built as a module. If so, the module | 396 | This driver can also be built as a module. If so, the module |
397 | will be called rtc-m41t80. | 397 | will be called rtc-m41t80. |
diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c index d348b23ce18b..7ff7427c2e6a 100644 --- a/drivers/rtc/rtc-m41t80.c +++ b/drivers/rtc/rtc-m41t80.c | |||
@@ -78,6 +78,7 @@ static const struct i2c_device_id m41t80_id[] = { | |||
78 | { "m41st84", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ }, | 78 | { "m41st84", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ }, |
79 | { "m41st85", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ }, | 79 | { "m41st85", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ }, |
80 | { "m41st87", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ }, | 80 | { "m41st87", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ }, |
81 | { "rv4162", M41T80_FEATURE_SQ | M41T80_FEATURE_WD | M41T80_FEATURE_SQ_ALT }, | ||
81 | { } | 82 | { } |
82 | }; | 83 | }; |
83 | MODULE_DEVICE_TABLE(i2c, m41t80_id); | 84 | MODULE_DEVICE_TABLE(i2c, m41t80_id); |