The patch titled
Subject: rtc-rtc-isl12057-add-alarm-support-to-intersil-isl12057-rtc-driver-update
has been added to the -mm tree. Its filename is
rtc-rtc-isl12057-add-alarm-support-to-intersil-isl12057-rtc-driver-update.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/rtc-rtc-isl12057-add-alarm-support-to-intersil-isl12057-rtc-driver-update.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/rtc-rtc-isl12057-add-alarm-support-to-intersil-isl12057-rtc-driver-update.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Arnaud Ebalard <arno@xxxxxxxxxxxx>
Subject: rtc-rtc-isl12057-add-alarm-support-to-intersil-isl12057-rtc-driver-update
Signed-off-by: Arnaud Ebalard <arno@xxxxxxxxxxxx>
Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Cc: Uwe Kleine-König <uwe@xxxxxxxxxxxxxxxxx>
Cc: Mark Brown <broonie@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Documentation/devicetree/bindings/i2c/trivial-devices.txt | 2 -
drivers/rtc/rtc-isl12057.c | 15 ++--------
2 files changed, 5 insertions(+), 12 deletions(-)
diff -puN Documentation/devicetree/bindings/i2c/trivial-devices.txt~rtc-rtc-isl12057-add-alarm-support-to-intersil-isl12057-rtc-driver-update Documentation/devicetree/bindings/i2c/trivial-devices.txt
--- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt~rtc-rtc-isl12057-add-alarm-support-to-intersil-isl12057-rtc-driver-update
+++ a/Documentation/devicetree/bindings/i2c/trivial-devices.txt
@@ -58,7 +58,7 @@ fsl,sgtl5000 SGTL5000: Ultra Low-Power
gmt,g751 G751: Digital Temperature Sensor and Thermal Watchdog with Two-Wire Interface
infineon,slb9635tt Infineon SLB9635 (Soft-) I2C TPM (old protocol, max 100khz)
infineon,slb9645tt Infineon SLB9645 I2C TPM (new protocol, max 400khz)
-isl,isl12057 Intersil ISL12057 I2C RTC/Alarm Chip
+isl,isl12057 Intersil ISL12057 I2C RTC Chip
isil,isl29028 (deprecated, use isl)
isl,isl29028 Intersil ISL29028 Ambient Light and Proximity Sensor
maxim,ds1050 5 Bit Programmable, Pulse-Width Modulator
diff -puN drivers/rtc/rtc-isl12057.c~rtc-rtc-isl12057-add-alarm-support-to-intersil-isl12057-rtc-driver-update drivers/rtc/rtc-isl12057.c
--- a/drivers/rtc/rtc-isl12057.c~rtc-rtc-isl12057-add-alarm-support-to-intersil-isl12057-rtc-driver-update
+++ a/drivers/rtc/rtc-isl12057.c
@@ -1,5 +1,5 @@
/*
- * rtc-isl12057 - Driver for Intersil ISL12057 I2C Real Time Clock / Alarm
+ * rtc-isl12057 - Driver for Intersil ISL12057 I2C Real Time Clock
*
* Copyright (C) 2013, Arnaud EBALARD <arno@xxxxxxxxxxxx>
*
@@ -555,14 +555,7 @@ static int isl12057_probe(struct i2c_cli
client->irq, ret);
}
- /*
- * This is needed to have 'wakealarm' sysfs entry available. One
- * would expect the device to be marked as a wakeup source only
- * when an IRQ pin of the RTC is routed to an interrupt line of the
- * CPU. In practice, such an IRQ pin can be connected to a PMIC and
- * this allows the device to be powered up when RTC alarm rings.
- */
- device_init_wakeup(dev, true);
+ device_init_wakeup(dev, !!data->irq);
data->rtc = devm_rtc_device_register(dev, DRV_NAME, &rtc_ops,
THIS_MODULE);
@@ -585,7 +578,7 @@ static int isl12057_remove(struct i2c_cl
{
struct isl12057_rtc_data *rtc_data = dev_get_drvdata(&client->dev);
- if (rtc_data->irq > 0)
+ if (rtc_data->irq)
device_init_wakeup(&client->dev, false);
return 0;
@@ -643,5 +636,5 @@ static struct i2c_driver isl12057_driver
module_i2c_driver(isl12057_driver);
MODULE_AUTHOR("Arnaud EBALARD <arno@xxxxxxxxxxxx>");
-MODULE_DESCRIPTION("Intersil ISL12057 RTC/Alarm driver");
+MODULE_DESCRIPTION("Intersil ISL12057 RTC driver");
MODULE_LICENSE("GPL");
_
Patches currently in -mm which might be from arno@xxxxxxxxxxxx are
origin.patch
rtc-rtc-isl12057-add-alarm-support-to-intersil-isl12057-rtc-driver.patch
rtc-rtc-isl12057-add-alarm-support-to-intersil-isl12057-rtc-driver-update.patch
rtc-rtc-isl12057-add-isilirq2-can-wakeup-machine-property-for-in-tree-users.patch
arm-mvebu-isl12057-rtc-chip-can-now-wake-up-rn102-rn102-and-rn2120.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
