diff options
-rw-r--r-- | drivers/rtc/Kconfig | 8 | ||||
-rw-r--r-- | drivers/rtc/rtc-ds1307.c | 6 |
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 | ||
210 | config RTC_DRV_DS1307 | 210 | config 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 | }; |
191 | MODULE_DEVICE_TABLE(i2c, ds1307_id); | 192 | MODULE_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) { |