From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 22 Feb 2021 17:54:19 +0000 (-0800)
Subject: Merge tag 'rtc-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0328b5f2ef4af8ba060e64baa928c94037e7308f;p=linux.git

Merge tag 'rtc-5.12' of git://git./linux/kernel/git/abelloni/linux

Pull RTC updates from Alexandre Belloni:
 "Many cleanups and a few drivers removal this cycle.

  Subsystem:
   - Introduce features bitfield and the first feature: RTC_FEATURE_ALARM

  Removed drivers:
   - ab3100
   - coh901331
   - tx4939
   - sirfsoc

  Drivers:
   - use rtc_lock and rtc_unlock instead of opencoding
   - constify all struct rtc_class_ops
   - quiet maybe-unused variable warning
   - replace spin_lock_irqsave with spin_lock in hard IRQ
   - pcf2127: disable Power-On Reset Override and run OTP refresh"

* tag 'rtc-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (81 commits)
  rtc: abx80x: Add utility function for writing configuration key
  rtc: pcf2127: properly set flag WD_CD for rtc chips(pcf2129, pca2129)
  rtc: pcf8563: Add NXP PCA8565 compatible
  rtc: s3c: quiet maybe-unused variable warning
  rtc: s3c: stop setting bogus time
  rtc: sd3078: quiet maybe-unused variable warning
  rtc: s35390a: quiet maybe-unused variable warning
  rtc: rx8581: quiet maybe-unused variable warning
  rtc: rx8010: quiet maybe-unused variable warning
  rtc: rv8803: quiet maybe-unused variable warning
  rtc: rv3032: quiet maybe-unused variable warning
  rtc: rv3029: quiet maybe-unused variable warning
  rtc: rv3028: quiet maybe-unused variable warning
  rtc: rs5c372: quiet maybe-unused variable warning
  rtc: pcf85363: quiet maybe-unused variable warning
  rtc: pcf85063: quiet maybe-unused variable warnings
  rtc: meson: quiet maybe-unused variable warning
  rtc: m41t80: quiet maybe-unused variable warning
  rtc: isl1208: quiet maybe-unused variable warning
  rtc: ds3232: quiet maybe-unused variable warning
  ...
---

0328b5f2ef4af8ba060e64baa928c94037e7308f
diff --cc drivers/rtc/Makefile
index f8ac4f574522c,54e0a8855cec7..4e930183c1708
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@@ -171,9 -168,9 +168,8 @@@ obj-$(CONFIG_RTC_DRV_TPS6586X)	+= rtc-t
  obj-$(CONFIG_RTC_DRV_TPS65910)	+= rtc-tps65910.o
  obj-$(CONFIG_RTC_DRV_TPS80031)	+= rtc-tps80031.o
  obj-$(CONFIG_RTC_DRV_TWL4030)	+= rtc-twl.o
- obj-$(CONFIG_RTC_DRV_TX4939)	+= rtc-tx4939.o
  obj-$(CONFIG_RTC_DRV_V3020)	+= rtc-v3020.o
  obj-$(CONFIG_RTC_DRV_VR41XX)	+= rtc-vr41xx.o
 -obj-$(CONFIG_RTC_DRV_VRTC)	+= rtc-mrst.o
  obj-$(CONFIG_RTC_DRV_VT8500)	+= rtc-vt8500.o
  obj-$(CONFIG_RTC_DRV_WILCO_EC)	+= rtc-wilco-ec.o
  obj-$(CONFIG_RTC_DRV_WM831X)	+= rtc-wm831x.o