From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Aug 2022 01:17:42 +0000 (-0700)
Subject: Merge tag 'rtc-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
X-Git-Tag: microblaze-v6.1~22
X-Git-Url: http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=commitdiff_plain;h=3d076fec5a0c3e66e1d8cb16015ea9a59b66ae1b

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

Pull RTC updates from Alexandre Belloni:
 "New drivers:
   - Microchip PolarFire
   - Nuvoton NCT3018Y
   - TI K3 RTC

  Subsystem:
   - Replace flush_scheduled_work() with flush_work()
   - Remove deprecated ida_simple_get()/ida_simple_remove() calls

  Drivers:
   - use simple i2c probe where possible
   - sun6i: add R329 support
   - zynqmp: add calibration support
   - vr41xx: remove unused driver"

* tag 'rtc-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (31 commits)
  rtc: spear: set range max
  rtc: rtc-cmos: Do not check ACPI_FADT_LOW_POWER_S0
  rtc: zynqmp: initialize fract_tick
  rtc: Add NCT3018Y real time clock driver
  dt-bindings: rtc: nuvoton: add NCT3018Y Real Time Clock
  dt-bindings: rtc: nxp,pcf85063: Convert to DT schema
  dt-bindings: rtc: microcrystal,rv3032: Add missing type to 'trickle-voltage-millivolt'
  rtc: rx8025: fix 12/24 hour mode detection on RX-8035
  rtc: cros-ec: Only warn once in .remove() about notifier_chain problems
  rtc: vr41xx: remove driver
  rtc: mpfs: remove 'pending' variable from mpfs_rtc_wakeup_irq_handler()
  rtc: rv8803: fix missing unlock on error in rv8803_set_time()
  rtc: zynqmp: Add calibration set and get support
  rtc: zynqmp: Updated calibration value
  dt-bindings: rtc: zynqmp: Add clock information
  rtc: sun6i: add support for R329 RTC
  rtc: Directly use ida_alloc()/free()
  rtc: Introduce ti-k3-rtc
  dt-bindings: rtc: Add TI K3 RTC description
  dt-bindings: rtc: qcom-pm8xxx-rtc: Update the maintainers section
  ...
---

3d076fec5a0c3e66e1d8cb16015ea9a59b66ae1b
diff --cc MAINTAINERS
index 08a5d70ceef9,5f9233716ab5..80e4f67c3826
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2486,13 -2446,13 +2486,15 @@@ S:	Supporte
  F:	Documentation/devicetree/bindings/*/*/*npcm*
  F:	Documentation/devicetree/bindings/*/*npcm*
  F:	Documentation/devicetree/bindings/arm/npcm/*
+ F:	Documentation/devicetree/bindings/rtc/nuvoton,nct3018y.yaml
  F:	arch/arm/boot/dts/nuvoton-npcm*
  F:	arch/arm/mach-npcm/
 +F:	arch/arm64/boot/dts/nuvoton/
  F:	drivers/*/*npcm*
  F:	drivers/*/*/*npcm*
+ F:	drivers/rtc/rtc-nct3018y.c
  F:	include/dt-bindings/clock/nuvoton,npcm7xx-clock.h
 +F:	include/dt-bindings/clock/nuvoton,npcm845-clk.h
  
  ARM/NUVOTON WPCM450 ARCHITECTURE
  M:	Jonathan Neuschäfer <j.neuschaefer@gmx.net>
@@@ -17525,13 -17143,9 +17527,14 @@@ M:	Daire McNamara <daire.mcnamara@micro
  L:	linux-riscv@lists.infradead.org
  S:	Supported
  F:	arch/riscv/boot/dts/microchip/
 +F:	drivers/char/hw_random/mpfs-rng.c
 +F:	drivers/clk/microchip/clk-mpfs.c
  F:	drivers/mailbox/mailbox-mpfs.c
 +F:	drivers/pci/controller/pcie-microchip-host.c
+ F:	drivers/rtc/rtc-mpfs.c
  F:	drivers/soc/microchip/
 +F:	drivers/spi/spi-microchip-core.c
 +F:	drivers/usb/musb/mpfs.c
  F:	include/soc/microchip/mpfs.h
  
  RNBD BLOCK DRIVERS