drivers/rtc/rtc-m41t80.c: add support for MicroCrystal rv4162
authorWolfram Sang <wsa@sang-engineering.com>
Fri, 6 Jun 2014 21:35:47 +0000 (14:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jun 2014 23:08:07 +0000 (16:08 -0700)
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>
drivers/rtc/Kconfig
drivers/rtc/rtc-m41t80.c

index ac4fa56280cd30e3375983bfb88e73124ea40706..f4e113874e7a721ae0d793f6c62c0abc2616e46f 100644 (file)
@@ -386,12 +386,12 @@ config RTC_DRV_PCF8583
          will be called rtc-pcf8583.
 
 config RTC_DRV_M41T80
-       tristate "ST M41T62/65/M41T80/81/82/83/84/85/87"
+       tristate "ST M41T62/65/M41T80/81/82/83/84/85/87 and compatible"
        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: M41T62, M41T65, M41T80, M41T81, M41T82, M41T83, M41ST84,
-         M41ST85, and M41ST87.
+         M41ST85, M41ST87, and MicroCrystal RV4162.
 
          This driver can also be built as a module. If so, the module
          will be called rtc-m41t80.
index d348b23ce18b53891821d78d5be44a53c490202d..7ff7427c2e6ac9cb6d4e4d6232cf5fd50998bd5f 100644 (file)
@@ -78,6 +78,7 @@ static const struct i2c_device_id m41t80_id[] = {
        { "m41st84", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },
        { "m41st85", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },
        { "m41st87", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },
+       { "rv4162", M41T80_FEATURE_SQ | M41T80_FEATURE_WD | M41T80_FEATURE_SQ_ALT },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, m41t80_id);