Commit 8e4ff713 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RTC updates from Alexandre Belloni:
 "A huge series from me this cycle. I went through many drivers to set
  the date and time range supported by the RTC which helps solving HW
  limitation when the time comes (as early as next year for some). This
  time, I focused on drivers using .set_mms and .set_mmss64, allowing me
  to remove those callbacks. About a third of the patches got reviews, I
  actually own the RTCs and I tested another third and the remaining one
  are unlikely to cause any issues.

  Other than that, a single new driver and the usual fixes here and there.

  Summary:

  Subsystem:

   - set_mmss and set_mmss64 rtc_ops removal

   - Fix timestamp value for RTC_TIMESTAMP_BEGIN_1900

   - Use SPDX identifier for the core

   - validate upper bound of tm->tm_year

  New driver:

   - Aspeed BMC SoC RTC

  Drivers:

   - abx80x: use rtc_add_group

   - ds3232: nvram support

   - pcf85063: add alarm, nvram, offset correction and microcrystal
     rv8263 support

   - x1205: add of_match_table

   - Use set_time instead of set_mms/set_mmss64 for: ab3100, coh901331,
     digicolor, ds1672, ds2404, ep93xx, imxdi, jz4740, lpc32xx, mc13xxx,
     mxc, pcap, stmp3xxx, test, wm831x, xgene.

   - Set RTC range for: ab3100, at91sam9, coh901331, da9063, digicolor,
     dm355evm, ds1672, ds2404, ep39xx, goldfish, imxdi, jz4740, lpc32xx,
     mc13xxx, mv, mxc, omap, pcap, pcf85063, pcf85363, ps3, sh,
     stmp3xxx, sun4v, tegra, wm831x, xgene.

   - Switch to rtc_time64_to_tm/rtc_tm_to_time64 for the driver that
     properly set the RTC range.

   - Use dev_get_drvdata instead of multiple indirections"

* tag 'rtc-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (177 commits)
  rtc: snvs: Use __maybe_unused instead of #if CONFIG_PM_SLEEP
  rtc: imxdi: remove unused variable
  rtc: drop set_mms and set_mmss64
  rtc: pcap: convert to SPDX identifier
  rtc: pcap: use .set_time
  rtc: pcap: switch to rtc_time64_to_tm/rtc_tm_to_time64
  rtc: pcap: set range
  rtc: digicolor: convert to SPDX identifier
  rtc: digicolor: use .set_time
  rtc: digicolor: set range
  rtc: digicolor: fix possible race condition
  rtc: jz4740: convert to SPDX identifier
  rtc: jz4740: rework invalid time detection
  rtc: jz4740: use dev_pm_set_wake_irq() to simplify code
  rtc: jz4740: use .set_time
  rtc: jz4740: remove useless check
  rtc: jz4740: switch to rtc_time64_to_tm/rtc_tm_to_time64
  rtc: jz4740: set range
  rtc: 88pm860x: prevent use-after-free on device remove
  rtc: Use dev_get_drvdata()
  ...
parents 45182e4e dacb6a40

Documentation/devicetree/bindings/rtc/nxp,pcf85063.txt

+5 −1
Original line number Diff line number Diff line 
* NXP PCF85063 Real Time Clock



Required properties:

- compatible: Should contain "nxp,pcf85063".

- compatible: Should one of contain:

	"nxp,pcf85063",

	"nxp,pcf85063a",

	"nxp,pcf85063tp",

	"microcrystal,rv8263"

- reg: I2C address for chip.



Optional property:

Documentation/devicetree/bindings/rtc/rtc-aspeed.txt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
ASPEED BMC RTC

==============



Required properties:

 - compatible: should be one of the following

   * aspeed,ast2400-rtc for the ast2400

   * aspeed,ast2500-rtc for the ast2500

   * aspeed,ast2600-rtc for the ast2600



 - reg: physical base address of the controller and length of memory mapped

   region



 - interrupts: The interrupt number



Example:



   rtc@1e781000 {

           compatible = "aspeed,ast2400-rtc";

           reg = <0x1e781000 0x18>;

           interrupts = <22>;

           status = "disabled";

   };

Documentation/devicetree/bindings/rtc/rtc.txt

+1 −0
Original line number Diff line number Diff line
@@ -69,3 +69,4 @@ ricoh,rv5c386 I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC 
ricoh,rv5c387a		I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC

sii,s35390a		2-wire CMOS real-time clock

whwave,sd3078		I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC

xircom,x1205		Xircom X1205 I2C RTC

drivers/rtc/Kconfig

+15 −4
Original line number Diff line number Diff line
@@ -439,6 +439,7 @@ config RTC_DRV_PCF8523 


config RTC_DRV_PCF85063

	tristate "NXP PCF85063"

	select REGMAP_I2C

	help

	  If you say yes here you get support for the PCF85063 RTC chip
@@ -447,7 +448,6 @@ config RTC_DRV_PCF85063 


config RTC_DRV_PCF85363

	tristate "NXP PCF85363"

	depends on I2C

	select REGMAP_I2C

	help

	  If you say yes here you get support for the PCF85363 RTC chip.
@@ -602,7 +602,6 @@ config RTC_DRV_FM3130 


config RTC_DRV_RX8010

	tristate "Epson RX8010SJ"

	depends on I2C

	help

	  If you say yes here you get support for the Epson RX8010SJ RTC

	  chip.
@@ -1432,7 +1431,7 @@ config RTC_DRV_AT91RM9200 
config RTC_DRV_AT91SAM9

	tristate "AT91SAM9 RTT as RTC"

	depends on ARCH_AT91 || COMPILE_TEST

	depends on HAS_IOMEM

	depends on OF && HAS_IOMEM

	select MFD_SYSCON

	help

	  Some AT91SAM9 SoCs provide an RTT (Real Time Timer) block which
@@ -1841,6 +1840,17 @@ config RTC_DRV_RTD119X 
	  If you say yes here, you get support for the RTD1295 SoC

	  Real Time Clock.



config RTC_DRV_ASPEED

	tristate "ASPEED RTC"

	depends on OF

	depends on ARCH_ASPEED || COMPILE_TEST

	help

	  If you say yes here you get support for the ASPEED BMC SoC real time

	  clocks.



	  This driver can also be built as a module, if so, the module

	  will be called "rtc-aspeed".



comment "HID Sensor RTC drivers"



config RTC_DRV_HID_SENSOR_TIME
@@ -1857,7 +1867,8 @@ config RTC_DRV_HID_SENSOR_TIME 


config RTC_DRV_GOLDFISH

	tristate "Goldfish Real Time Clock"

	depends on MIPS && (GOLDFISH || COMPILE_TEST)

	depends on OF && HAS_IOMEM

	depends on GOLDFISH || COMPILE_TEST

	help

	  Say yes to enable RTC driver for the Goldfish based virtual platform.

drivers/rtc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ obj-$(CONFIG_RTC_DRV_AC100) += rtc-ac100.o 
obj-$(CONFIG_RTC_DRV_ARMADA38X)	+= rtc-armada38x.o

obj-$(CONFIG_RTC_DRV_AS3722)	+= rtc-as3722.o

obj-$(CONFIG_RTC_DRV_ASM9260)	+= rtc-asm9260.o

obj-$(CONFIG_RTC_DRV_ASPEED)	+= rtc-aspeed.o

obj-$(CONFIG_RTC_DRV_AT91RM9200)+= rtc-at91rm9200.o

obj-$(CONFIG_RTC_DRV_AT91SAM9)	+= rtc-at91sam9.o

obj-$(CONFIG_RTC_DRV_AU1XXX)	+= rtc-au1xxx.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE