aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2016-07-12 20:36:41 -0400
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2016-08-31 12:21:34 -0400
commit78aaa06d7956dc4cd42fff5033f4bf6fafcbc79f (patch)
tree755e6e13c16fa918af5ca34cf035c3fa96f2392a
parent50d6c0ea8111100a102c03b4410ba1e45fa8b771 (diff)
rtc: ds1307: add Intersil ISL12057 support
Intersil ISL12057 is a drop-in replacement for DS1337. It can be supported by the ds1307 driver. Acked-by: Arnaud Ebalard <arno@natisbad.org> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
-rw-r--r--drivers/rtc/Kconfig8
-rw-r--r--drivers/rtc/rtc-ds1307.c6
2 files changed, 10 insertions, 4 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 6ce3dad73253..83a788416721 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -208,14 +208,14 @@ config RTC_DRV_AS3722
208 will be called rtc-as3722. 208 will be called rtc-as3722.
209 209
210config RTC_DRV_DS1307 210config RTC_DRV_DS1307
211 tristate "Dallas/Maxim DS1307/37/38/39/40, ST M41T00, EPSON RX-8025" 211 tristate "Dallas/Maxim DS1307/37/38/39/40, ST M41T00, EPSON RX-8025, ISL12057"
212 help 212 help
213 If you say yes here you get support for various compatible RTC 213 If you say yes here you get support for various compatible RTC
214 chips (often with battery backup) connected with I2C. This driver 214 chips (often with battery backup) connected with I2C. This driver
215 should handle DS1307, DS1337, DS1338, DS1339, DS1340, ST M41T00, 215 should handle DS1307, DS1337, DS1338, DS1339, DS1340, ST M41T00,
216 EPSON RX-8025 and probably other chips. In some cases the RTC 216 EPSON RX-8025, Intersil ISL12057 and probably other chips. In some
217 must already have been initialized (by manufacturing or a 217 cases the RTC must already have been initialized (by manufacturing or
218 bootloader). 218 a bootloader).
219 219
220 The first seven registers on these chips hold an RTC, and other 220 The first seven registers on these chips hold an RTC, and other
221 registers may add features such as NVRAM, a trickle charger for 221 registers may add features such as NVRAM, a trickle charger for
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index 712e221d2415..4e31036ee259 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -186,6 +186,7 @@ static const struct i2c_device_id ds1307_id[] = {
186 { "mcp7941x", mcp794xx }, 186 { "mcp7941x", mcp794xx },
187 { "pt7c4338", ds_1307 }, 187 { "pt7c4338", ds_1307 },
188 { "rx8025", rx_8025 }, 188 { "rx8025", rx_8025 },
189 { "isl12057", ds_1337 },
189 { } 190 { }
190}; 191};
191MODULE_DEVICE_TABLE(i2c, ds1307_id); 192MODULE_DEVICE_TABLE(i2c, ds1307_id);
@@ -1333,6 +1334,11 @@ static int ds1307_probe(struct i2c_client *client,
1333 if (of_property_read_bool(client->dev.of_node, "wakeup-source")) { 1334 if (of_property_read_bool(client->dev.of_node, "wakeup-source")) {
1334 ds1307_can_wakeup_device = true; 1335 ds1307_can_wakeup_device = true;
1335 } 1336 }
1337 /* Intersil ISL12057 DT backward compatibility */
1338 if (of_property_read_bool(client->dev.of_node,
1339 "isil,irq2-can-wakeup-machine")) {
1340 ds1307_can_wakeup_device = true;
1341 }
1336#endif 1342#endif
1337 1343
1338 switch (ds1307->type) { 1344 switch (ds1307->type) {