RTC fixes for 4.6
A documentation fix for s3c and two fixes for the ds1307. -----BEGIN PGP SIGNATURE----- iQIcBAABCgAGBQJXGVFgAAoJENiigzvaE+LCOVAQAIMHfxfhcKPv05RXgOuxrIJ5 0YdQZG9/CTRr93KgfeeDznI1Zdsg+YdZQxuSzTmlxMt5KBmW1zqs0iAxLQXjwNVO Sjb+kkNh7p2d5UkKfEqrSCsz4PRYMR5GJ3PINN9M2b5txOQjiQ45TizrGGNoi893 AYvvlUrGs8aVOOyV2IaoKh5BB+H56TAPSQBA3i1hJ6epjirchL4ySbmYTMT3bIWL c9Hkr9TLH8zltnkyfYWs1pjUgheOS5VerB+oRXB+I46Vg6Ob4i+MxdYdbe11c4uO ew/xbztiJF2/iHB7/V4CFAxkUl/f+z13ufueo39oVxAdvuQaX+kZbUYdBYtu+tNL 5nM1gcDDl87/MhbPogjhpj3WyJB1XCq2ziQ7//ZkEJ7ILWEx4bVoWaLEIbNrsqW2 zp2X+lQMSKx8gHRxO+PnCA93WzKKy7tGZ7G7ct7E4M0UdTR9/LrCnCo4OwGp0K2e QHVWVyJSeH1xJnhHvC2hk5QU/g9JQbyjBTH7WVL/CYbUIihe0i+Vlw+8NLF6tA/1 BhRkuoQC9gCq0Qjt304WT62y0U5eBDjsgp1VN6i/B7ovIqLoBQIVP+KnEzClHMmM 7wouYhEU7TlU3ugYgmnFiS2zH2544qB+p2sU0uCHBHXah7wUyagnBwvw4/zuS2Tf 390v+/CwnuKm1hGBsOSV =tU6V -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
5f44abd041
|
@ -15,9 +15,10 @@ Required properties:
|
||||||
is the rtc tick interrupt. The number of cells representing a interrupt
|
is the rtc tick interrupt. The number of cells representing a interrupt
|
||||||
depends on the parent interrupt controller.
|
depends on the parent interrupt controller.
|
||||||
- clocks: Must contain a list of phandle and clock specifier for the rtc
|
- clocks: Must contain a list of phandle and clock specifier for the rtc
|
||||||
and source clocks.
|
clock and in the case of a s3c6410 compatible controller, also
|
||||||
- clock-names: Must contain "rtc" and "rtc_src" entries sorted in the
|
a source clock.
|
||||||
same order as the clocks property.
|
- clock-names: Must contain "rtc" and for a s3c6410 compatible controller,
|
||||||
|
a "rtc_src" sorted in the same order as the clocks property.
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
|
|
||||||
|
|
|
@ -863,7 +863,7 @@ out:
|
||||||
* A user-initiated temperature conversion is not started by this function,
|
* A user-initiated temperature conversion is not started by this function,
|
||||||
* so the temperature is updated once every 64 seconds.
|
* so the temperature is updated once every 64 seconds.
|
||||||
*/
|
*/
|
||||||
static int ds3231_hwmon_read_temp(struct device *dev, s16 *mC)
|
static int ds3231_hwmon_read_temp(struct device *dev, s32 *mC)
|
||||||
{
|
{
|
||||||
struct ds1307 *ds1307 = dev_get_drvdata(dev);
|
struct ds1307 *ds1307 = dev_get_drvdata(dev);
|
||||||
u8 temp_buf[2];
|
u8 temp_buf[2];
|
||||||
|
@ -892,7 +892,7 @@ static ssize_t ds3231_hwmon_show_temp(struct device *dev,
|
||||||
struct device_attribute *attr, char *buf)
|
struct device_attribute *attr, char *buf)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
s16 temp;
|
s32 temp;
|
||||||
|
|
||||||
ret = ds3231_hwmon_read_temp(dev, &temp);
|
ret = ds3231_hwmon_read_temp(dev, &temp);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
@ -1531,7 +1531,7 @@ read_rtc:
|
||||||
return PTR_ERR(ds1307->rtc);
|
return PTR_ERR(ds1307->rtc);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ds1307_can_wakeup_device) {
|
if (ds1307_can_wakeup_device && ds1307->client->irq <= 0) {
|
||||||
/* Disable request for an IRQ */
|
/* Disable request for an IRQ */
|
||||||
want_irq = false;
|
want_irq = false;
|
||||||
dev_info(&client->dev, "'wakeup-source' is set, request for an IRQ is disabled!\n");
|
dev_info(&client->dev, "'wakeup-source' is set, request for an IRQ is disabled!\n");
|
||||||
|
|
Loading…
Reference in a new issue