Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'rtc-4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC fixes from Alexandre Belloni:
"A few fixes for the RTC subsystem. The documentation fix already
missed 4.5 so I think it is worth taking it now:
A documentation fix for s3c and two fixes for the ds1307"
* tag 'rtc-4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
rtc: ds1307: Use irq when available for wakeup-source device
rtc: ds1307: ds3231 temperature s16 overflow
rtc: s3c: Document in binding that only s3c6410 needs a src clk
+7
-6
+4
-3
Documentation/devicetree/bindings/rtc/s3c-rtc.txt
+4
-3
Documentation/devicetree/bindings/rtc/s3c-rtc.txt
···
15
15
is the rtc tick interrupt. The number of cells representing a interrupt
16
16
depends on the parent interrupt controller.
17
17
- clocks: Must contain a list of phandle and clock specifier for the rtc
18
-
and source clocks.
19
-
- clock-names: Must contain "rtc" and "rtc_src" entries sorted in the
20
-
same order as the clocks property.
18
+
clock and in the case of a s3c6410 compatible controller, also
19
+
a source clock.
20
+
- clock-names: Must contain "rtc" and for a s3c6410 compatible controller,
21
+
a "rtc_src" sorted in the same order as the clocks property.
21
22
22
23
Example:
23
24
+3
-3
drivers/rtc/rtc-ds1307.c
+3
-3
drivers/rtc/rtc-ds1307.c
···
863
863
* A user-initiated temperature conversion is not started by this function,
864
864
* so the temperature is updated once every 64 seconds.
865
865
*/
866
-
static int ds3231_hwmon_read_temp(struct device *dev, s16 *mC)
866
+
static int ds3231_hwmon_read_temp(struct device *dev, s32 *mC)
867
867
{
868
868
struct ds1307 *ds1307 = dev_get_drvdata(dev);
869
869
u8 temp_buf[2];
···
892
892
struct device_attribute *attr, char *buf)
893
893
{
894
894
int ret;
895
-
s16 temp;
895
+
s32 temp;
896
896
897
897
ret = ds3231_hwmon_read_temp(dev, &temp);
898
898
if (ret)
···
1531
1531
return PTR_ERR(ds1307->rtc);
1532
1532
}
1533
1533
1534
-
if (ds1307_can_wakeup_device) {
1534
+
if (ds1307_can_wakeup_device && ds1307->client->irq <= 0) {
1535
1535
/* Disable request for an IRQ */
1536
1536
want_irq = false;
1537
1537
dev_info(&client->dev, "'wakeup-source' is set, request for an IRQ is disabled!\n");