Commit 54eb8462 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RTC updates from Alexandre Belloni:
 "A new driver represents the bulk of the changes and then we get the
  usual small fixes.

  New driver:

   - Renesas RZN1 rtc

  Drivers:

   - sun6i: Add nvmem support"

* tag 'rtc-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  rtc: mxc: Silence a clang warning
  rtc: rzn1: Fix a variable type
  rtc: rzn1: Fix error code in probe
  rtc: rzn1: Avoid mixing variables
  rtc: ftrtc010: Fix error handling in ftrtc010_rtc_probe
  rtc: mt6397: check return value after calling platform_get_resource()
  rtc: rzn1: fix platform_no_drv_owner.cocci warning
  rtc: gamecube: Add missing iounmap in gamecube_rtc_read_offset_from_sram
  rtc: meson: Fix email address in MODULE_AUTHOR
  rtc: simplify the return expression of rx8025_set_offset()
  rtc: pcf85063: Add a compatible entry for pca85073a
  dt-binding: pcf85063: Add an entry for pca85073a
  MAINTAINERS: Add myself as maintainer of the RZN1 RTC driver
  rtc: rzn1: Add oscillator offset support
  rtc: rzn1: Add alarm support
  rtc: rzn1: Add new RTC driver
  dt-bindings: rtc: rzn1: Describe the RZN1 RTC
  rtc: sun6i: Add NVMEM provider
parents 55fe9217 f78e3d40

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

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


Required properties:

- compatible: Should one of contain:

	"nxp,pca85073a",

	"nxp,pcf85063",

	"nxp,pcf85063a",

	"nxp,pcf85063tp",

Documentation/devicetree/bindings/rtc/renesas,rzn1-rtc.yaml

0 → 100644
+70 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/rtc/renesas,rzn1-rtc.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Renesas RZ/N1 SoCs Real-Time Clock DT bindings



maintainers:

  - Miquel Raynal <miquel.raynal@bootlin.com>



allOf:

  - $ref: rtc.yaml#



properties:

  compatible:

    items:

      - enum:

          - renesas,r9a06g032-rtc

      - const: renesas,rzn1-rtc



  reg:

    maxItems: 1



  interrupts:

    minItems: 3

    maxItems: 3



  interrupt-names:

    items:

      - const: alarm

      - const: timer

      - const: pps



  clocks:

    maxItems: 1



  clock-names:

    const: hclk



  power-domains:

    maxItems: 1



required:

  - compatible

  - reg

  - interrupts

  - interrupt-names

  - clocks

  - clock-names

  - power-domains



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/clock/r9a06g032-sysctrl.h>

    rtc@40006000 {

       compatible = "renesas,r9a06g032-rtc", "renesas,rzn1-rtc";

       reg = <0x40006000 0x1000>;

       interrupts = <GIC_SPI 66 IRQ_TYPE_EDGE_RISING>,

                    <GIC_SPI 67 IRQ_TYPE_EDGE_RISING>,

                    <GIC_SPI 68 IRQ_TYPE_EDGE_RISING>;

       interrupt-names = "alarm", "timer", "pps";

       clocks = <&sysctrl R9A06G032_HCLK_RTC>;

       clock-names = "hclk";

       power-domains = <&sysctrl>;

       start-year = <2000>;

     };

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -16995,6 +16995,14 @@ S: Supported 
F:	Documentation/devicetree/bindings/iio/adc/renesas,rzg2l-adc.yaml

F:	drivers/iio/adc/rzg2l_adc.c









RENESAS RZ/N1 RTC CONTROLLER DRIVER









M:	Miquel Raynal <miquel.raynal@bootlin.com>









L:	linux-rtc@vger.kernel.org









L:	linux-renesas-soc@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/rtc/renesas,rzn1-rtc.yaml









F:	drivers/rtc/rtc-rzn1.c

















RENESAS R-CAR GEN3 & RZ/N1 NAND CONTROLLER DRIVER









M:	Miquel Raynal <miquel.raynal@bootlin.com>









L:	linux-mtd@lists.infradead.org
































drivers/rtc/Kconfig



+7
−0






























Original line number
Diff line number
Diff line







@@ -1548,6 +1548,13 @@ config RTC_DRV_RS5C313







	help









	  If you say yes here you get support for the Ricoh RS5C313 RTC chips.



















config RTC_DRV_RZN1









	tristate "Renesas RZ/N1 RTC"









	depends on ARCH_RZN1 || COMPILE_TEST









	depends on OF && HAS_IOMEM









	help









	  If you say yes here you get support for the Renesas RZ/N1 RTC.



















config RTC_DRV_GENERIC









	tristate "Generic RTC support"









	# Please consider writing a new RTC driver instead of using the generic
































drivers/rtc/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -151,6 +151,7 @@ obj-$(CONFIG_RTC_DRV_RX6110)	+= rtc-rx6110.o







obj-$(CONFIG_RTC_DRV_RX8010)	+= rtc-rx8010.o









obj-$(CONFIG_RTC_DRV_RX8025)	+= rtc-rx8025.o









obj-$(CONFIG_RTC_DRV_RX8581)	+= rtc-rx8581.o









obj-$(CONFIG_RTC_DRV_RZN1)	+= rtc-rzn1.o









obj-$(CONFIG_RTC_DRV_S35390A)	+= rtc-s35390a.o









obj-$(CONFIG_RTC_DRV_S3C)	+= rtc-s3c.o









obj-$(CONFIG_RTC_DRV_S5M)	+= rtc-s5m.o