Commit b7769c45 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RTC updates from Alexandre Belloni:
 "A new driver this cycle is making the bulk of the changes and the
  rx8010 driver has been rework to use the modern APIs.

  Summary:

  Subsystem:
   - new generic DT properties: aux-voltage-chargeable,
     trickle-voltage-millivolt

  New driver:
   - Microcrystal RV-3032

  Drivers:
   - ds1307: use aux-voltage-chargeable
   - r9701, rx8010: modernization of the driver
   - rv3028: fix clock output, trickle resistor values, RAM
     configuration registers"

* tag 'rtc-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (50 commits)
  rtc: r9701: set range
  rtc: r9701: convert to devm_rtc_allocate_device
  rtc: r9701: stop setting RWKCNT
  rtc: r9701: remove useless memset
  rtc: r9701: stop setting a default time
  rtc: r9701: remove leftover comment
  rtc: rv3032: Add a driver for Microcrystal RV-3032
  dt-bindings: rtc: rv3032: add RV-3032 bindings
  dt-bindings: rtc: add trickle-voltage-millivolt
  rtc: rv3028: ensure ram configuration registers are saved
  rtc: rv3028: factorize EERD bit handling
  rtc: rv3028: fix trickle resistor values
  rtc: rv3028: fix clock output support
  rtc: mt6397: Remove unused member dev
  rtc: rv8803: simplify the return expression of rv8803_nvram_write
  rtc: meson: simplify the return expression of meson_vrtc_probe
  rtc: rx8010: rename rx8010_init_client() to rx8010_init()
  rtc: ds1307: enable rx8130's backup battery, make it chargeable optionally
  rtc: ds1307: consider aux-voltage-chargeable
  rtc: ds1307: store previous charge default per chip
  ...
parents 68a36336 35331b50

Documentation/devicetree/bindings/rtc/microcrystal,rv3032.yaml

0 → 100644
+64 −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/microcrystal,rv3032.yaml#

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



title: Microchip RV-3032 RTC Device Tree Bindings



allOf:

  - $ref: "rtc.yaml#"



maintainers:

  - Alexandre Belloni <alexandre.belloni@bootlin.com>



properties:

  compatible:

    const: microcrystal,rv3032



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  start-year: true



  trickle-resistor-ohms:

    enum:

      - 1000

      - 2000

      - 7000

      - 11000



  trickle-voltage-millivolt:

    enum:

      - 1750

      - 3000

      - 4400



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

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

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        rtc@51 {

            compatible = "microcrystal,rv3032";

            reg = <0x51>;

            status = "okay";

            pinctrl-0 = <&rtc_nint_pins>;

            interrupts-extended = <&gpio1 16 IRQ_TYPE_LEVEL_HIGH>;

            trickle-resistor-ohms = <7000>;

            trickle-voltage-millivolt = <1750>;

        };

    };



...

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

+8 −1
Original line number Diff line number Diff line
@@ -31,9 +31,16 @@ Optional properties: 
	Selected resistor for trickle charger

	Possible values are 250, 2000, 4000

	Should be given if trickle charger should be enabled

- aux-voltage-chargeable: ds1339, ds1340, ds1388 and rx8130 only

	Tells whether the battery/supercap of the RTC (if any) is

	chargeable or not.

	Possible values are 0 (not chargeable), 1 (chargeable)



Deprecated properties:

- trickle-diode-disable : ds1339, ds1340 and ds1388 only

	Do not use internal trickle charger diode

	Should be given if internal trickle charger diode should be disabled

	(superseded by aux-voltage-chargeable)



Example:

	ds1339: rtc@68 {

Documentation/devicetree/bindings/rtc/rtc.yaml

+16 −0
Original line number Diff line number Diff line
@@ -17,6 +17,15 @@ properties: 
  $nodename:

    pattern: "^rtc(@.*|-[0-9a-f])*$"



  aux-voltage-chargeable:

    $ref: /schemas/types.yaml#/definitions/uint32

    enum: [0, 1]

    description: |

      Tells whether the battery/supercap of the RTC (if any) is

      chargeable or not:

      0: not chargeable

      1: chargeable



  quartz-load-femtofarads:

    $ref: /schemas/types.yaml#/definitions/uint32

    description:
@@ -35,6 +44,7 @@ properties: 
    description:

      Do not use internal trickle charger diode. Should be given if

      internal trickle charger diode should be disabled.

    deprecated: true



  trickle-resistor-ohms:

    $ref: /schemas/types.yaml#/definitions/uint32
@@ -42,6 +52,12 @@ properties: 
      Selected resistor for trickle charger. Should be given

      if trickle charger should be enabled.



  trickle-voltage-millivolt:

    description:

      Selected voltage for trickle charger. Should be given

      if trickle charger should be enabled and the trickle voltage is different

      from the RTC main power supply.



  wakeup-source:

    $ref: /schemas/types.yaml#/definitions/flag

    description:

drivers/rtc/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -669,6 +669,16 @@ config RTC_DRV_RV3028 
	  This driver can also be built as a module. If so, the module

	  will be called rtc-rv3028.



config RTC_DRV_RV3032

	tristate "Micro Crystal RV3032"

	select REGMAP_I2C

	help

	  If you say yes here you get support for the Micro Crystal

	  RV3032.



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

	  will be called rtc-rv3032.



config RTC_DRV_RV8803

	tristate "Micro Crystal RV8803, Epson RX8900"

	help

drivers/rtc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ obj-$(CONFIG_RTC_DRV_RS5C372) += rtc-rs5c372.o 
obj-$(CONFIG_RTC_DRV_RTD119X)	+= rtc-rtd119x.o

obj-$(CONFIG_RTC_DRV_RV3028)	+= rtc-rv3028.o

obj-$(CONFIG_RTC_DRV_RV3029C2)	+= rtc-rv3029c2.o

obj-$(CONFIG_RTC_DRV_RV3032)	+= rtc-rv3032.o

obj-$(CONFIG_RTC_DRV_RV8803)	+= rtc-rv8803.o

obj-$(CONFIG_RTC_DRV_RX4581)	+= rtc-rx4581.o

obj-$(CONFIG_RTC_DRV_RX6110)	+= rtc-rx6110.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE