Commit dc06fe51 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'rtc-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux 

Pull RTC updates from Alexandre Belloni:
 "Not much this cycle - mostly non urgent driver fixes:

   - ds1374: use watchdog core

   - pcf2127: add alarm and pcf2129 support"

* tag 'rtc-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  rtc: pcf2127: fix alarm handling
  rtc: pcf2127: add alarm support
  rtc: pcf2127: add pca2129 device id
  rtc: max77686: Fix wake-ups for max77620
  rtc: ds1307: provide an indication that the watchdog has fired
  rtc: ds1374: remove unused define
  rtc: ds1374: fix RTC_DRV_DS1374_WDT dependencies
  rtc: cleanup obsolete comment about struct rtc_class_ops
  rtc: pl031: fix set_alarm by adding back call to alarm_irq_enable
  rtc: ds1374: wdt: Use watchdog core for watchdog part
  rtc: Replace HTTP links with HTTPS ones
  rtc: goldfish: Enable interrupt in set_alarm() when necessary
  rtc: max77686: Do not allow interrupt to fire before system resume
  rtc: imxdi: fix trivial typos
  rtc: cpcap: fix range
parents 7c2a69f6 27006416

Documentation/devicetree/bindings/rtc/trivial-rtc.yaml

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ properties: 
      - nxp,pcf2127

      # Real-time clock

      - nxp,pcf2129

      # Real-time clock

      - nxp,pca2129

      # Real-time Clock Module

      - pericom,pt7c4338

      # I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC

drivers/rtc/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -281,7 +281,8 @@ config RTC_DRV_DS1374 


config RTC_DRV_DS1374_WDT

	bool "Dallas/Maxim DS1374 watchdog timer"

	depends on RTC_DRV_DS1374

	depends on RTC_DRV_DS1374 && WATCHDOG

	select WATCHDOG_CORE

	help

	  If you say Y here you will get support for the

	  watchdog timer in the Dallas Semiconductor DS1374

drivers/rtc/rtc-ab-b5ze-s3.c

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *

 * Detailed datasheet of the chip is available here:

 *

 *  http://www.abracon.com/realtimeclock/AB-RTCMC-32.768kHz-B5ZE-S3-Application-Manual.pdf

 *  https://www.abracon.com/realtimeclock/AB-RTCMC-32.768kHz-B5ZE-S3-Application-Manual.pdf

 *

 * This work is based on ISL12057 driver (drivers/rtc/rtc-isl12057.c).

 *

drivers/rtc/rtc-bq32k.c

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * Copyright (C) 2014 Pavel Machek <pavel@denx.de>

 *

 * You can get hardware description at

 * http://www.ti.com/lit/ds/symlink/bq32000.pdf

 * https://www.ti.com/lit/ds/symlink/bq32000.pdf

 */



#include <linux/module.h>

drivers/rtc/rtc-cpcap.c

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static int cpcap_rtc_probe(struct platform_device *pdev) 
		return PTR_ERR(rtc->rtc_dev);



	rtc->rtc_dev->ops = &cpcap_rtc_ops;

	rtc->rtc_dev->range_max = (1 << 14) * SECS_PER_DAY - 1;

	rtc->rtc_dev->range_max = (timeu64_t) (DAY_MASK + 1) * SECS_PER_DAY - 1;



	err = cpcap_get_vendor(dev, rtc->regmap, &rtc->vendor);

	if (err)

CRA Git | Maintained and supported by SUSTech CRA and CCSE