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

Pull RTC updates from Alexandre Belloni:
 "Subsystem:
   - constify rtc_class_ops structures

 New driver:
   - STM32

 Drivers:
   - armada38x: fix errata, Armada 7K/8K support
   - ds3232: fix wakeup support
   - gemini: DT support
   - m48t86: huge cleanup and platform_data removal
   - mcp795: alarm support
   - sun6i: proper oscillator handling
   - tegra: proper clock handling
   - tps65910: calibration support"

* tag 'rtc-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (44 commits)
  rtc: ds3232: Call device_init_wakeup before device_register
  rtc: pcf2127: bulk read only date and time registers.
  rtc: armada38x: Add support for Armada 7K/8K
  rtc: armada38x: Prepare driver to manage different versions
  rtc: ds3232: Add regmap max_register definition.
  rtc: ds3232: Cleanup whitespace around register and bit definitions.
  rtc: m48t86: remove unused platform_data
  ARM: Orion5x: ts78xx: allow rtc-m48t86 to manage it's own resources
  ARM: Orion5x: ts78xx: remove RTC detection
  ARM: ep93xx: ts72xx: allow rtc-m48t86 to manage its own resources
  rtc: m48t86: verify that the RTC is actually present
  rtc: m48t86: add NVRAM support
  rtc: m48t86: allow driver to manage its resources
  rtc: m48t86: shorten register name defines
  bindings: rtc: correct wrong reference in required properties
  rtc: sun6i: Fix return value check in sun6i_rtc_clk_init()
  rtc: sun6i: extend test coverage
  rtc: sun6i: Fix compatibility with old DT binding
  rtc: snvs: add a missing write sync
  rtc: bq32000: add support to enable disable the trickle charge FET bypass
  ...

diff --combined drivers/rtc/Kconfig
index 5dc673dc948785a79da8d070954323b9357385c1,b995b6efe0ea427f88a984f633248378efde69ed..ee1b0e9dde79a9ec4720c516a697fd5de1e72fcf
--- 1/drivers/rtc/Kconfig
--- 2/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@@ -1434,9 -1434,10 +1434,10 @@@ config RTC_DRV_SUN4
          based RTC on SUN4V systems.
  
  config RTC_DRV_SUN6I
-       tristate "Allwinner A31 RTC"
-       default MACH_SUN6I || MACH_SUN8I || COMPILE_TEST
-       depends on ARCH_SUNXI
+       bool "Allwinner A31 RTC"
+       default MACH_SUN6I || MACH_SUN8I
+       depends on COMMON_CLK
+       depends on ARCH_SUNXI || COMPILE_TEST
        help
          If you say Y here you will get support for the RTC found in
          some Allwinner SoCs like the A31 or the A64.
@@@ -1551,15 -1552,12 +1552,15 @@@ config RTC_DRV_MPC512
          will be called rtc-mpc5121.
  
  config RTC_DRV_JZ4740
 -      bool "Ingenic JZ4740 SoC"
 +      tristate "Ingenic JZ4740 SoC"
        depends on MACH_INGENIC || COMPILE_TEST
        help
          If you say yes here you get support for the Ingenic JZ47xx SoCs RTC
          controllers.
  
 +        This driver can also be buillt as a module. If so, the module
 +        will be called rtc-jz4740.
 +
  config RTC_DRV_LPC24XX
        tristate "NXP RTC for LPC178x/18xx/408x/43xx"
        depends on ARCH_LPC18XX || COMPILE_TEST
@@@ -1719,6 -1717,17 +1720,17 @@@ config RTC_DRV_R730
           This driver can also be built as a module. If so, the module
           will be called rtc-r7301.
  
+ config RTC_DRV_STM32
+       tristate "STM32 RTC"
+       select REGMAP_MMIO
+       depends on ARCH_STM32 || COMPILE_TEST
+       help
+          If you say yes here you get support for the STM32 On-Chip
+          Real Time Clock.
+ 
+          This driver can also be built as a module, if so, the module
+          will be called "rtc-stm32".
+ 
  comment "HID Sensor RTC drivers"
  
  config RTC_DRV_HID_SENSOR_TIME