Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1441941

[PATCH 2/3] rtc: ds1307: add Intersil ISL12057 support

Show all headers | View raw

Intersil ISL12057 is a drop-in replacement for DS1337. It can be supported
by the ds1307 driver.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 drivers/rtc/Kconfig      | 8 ++++----
 drivers/rtc/rtc-ds1307.c | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index f47c2f5ff70d..ba0b3e7ce4c5 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -198,14 +198,14 @@ config RTC_DRV_AS3722
 	  will be called rtc-as3722.
 
 config RTC_DRV_DS1307
-	tristate "Dallas/Maxim DS1307/37/38/39/40, ST M41T00, EPSON RX-8025"
+	tristate "Dallas/Maxim DS1307/37/38/39/40, ST M41T00, EPSON RX-8025, ISL12057"
 	help
 	  If you say yes here you get support for various compatible RTC
 	  chips (often with battery backup) connected with I2C. This driver
 	  should handle DS1307, DS1337, DS1338, DS1339, DS1340, ST M41T00,
-	  EPSON RX-8025 and probably other chips. In some cases the RTC
-	  must already have been initialized (by manufacturing or a
-	  bootloader).
+	  EPSON RX-8025, Intersil ISL12057 and probably other chips. In some
+	  cases the RTC must already have been initialized (by manufacturing or
+	  a bootloader).
 
 	  The first seven registers on these chips hold an RTC, and other
 	  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 4c5890864d9c..52be48f2e3c0 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[] = {
 	{ "mcp7941x", mcp794xx },
 	{ "pt7c4338", ds_1307 },
 	{ "rx8025", rx_8025 },
+	{ "isl1207", ds_1337 },
 	{ }
 };
 MODULE_DEVICE_TABLE(i2c, ds1307_id);
@@ -1333,6 +1334,11 @@ static int ds1307_probe(struct i2c_client *client,
 	if (of_property_read_bool(client->dev.of_node, "wakeup-source")) {
 		ds1307_can_wakeup_device = true;
 	}
+	/* Intersil ISL12057 DT backward compatibility */
+	if (of_property_read_bool(client->dev.of_node,
+				  "isil,irq2-can-wakeup-machine")) {
+		ds1307_can_wakeup_device = true;
+	}
 #endif
 
 	switch (ds1307->type) {
-- 
2.8.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/3] rtc: remove intersil isl12057 Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2016-07-13 03:10 +0200
  [PATCH 2/3] rtc: ds1307: add Intersil ISL12057 support Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2016-07-13 03:10 +0200
    Re: [PATCH 2/3] rtc: ds1307: add Intersil ISL12057 support arno@natisbad.org (Arnaud Ebalard) - 2016-07-14 22:10 +0200
  [PATCH 1/3] Documentation: dt: Intersil isl12057 is not a trivial device Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2016-07-13 03:10 +0200
    Re: [PATCH 1/3] Documentation: dt: Intersil isl12057 is not a trivial device arno@natisbad.org (Arnaud Ebalard) - 2016-07-14 22:20 +0200
      Re: [PATCH 1/3] Documentation: dt: Intersil isl12057 is not a  trivial device Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2016-07-20 21:40 +0200
        Re: [PATCH 1/3] Documentation: dt: Intersil isl12057 is not a trivial device Rob Herring <robh+dt@kernel.org> - 2016-07-21 00:50 +0200
  Re: [PATCH 0/3] rtc: remove intersil isl12057 arno@natisbad.org (Arnaud Ebalard) - 2016-07-14 22:20 +0200

csiph-web