Commit 5916a6fb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RTC updates from Alexandre Belloni:
 "We see a net reduction of the number of lines of code thanks to the
  removal of a now unused driver and a testing tool that is not used
  anymore. Apart from this, the max31335 driver gets support for a new
  part number and pm8xxx gets UEFI support.

  Core:

   - setdate is removed as it has better replacements

   - skip alarms with a second resolution when we know the RTC doesn't
     support those.

  Subsystem:

   - remove unnecessary private struct members

   - use devm_pm_set_wake_irq were relevant

  Drivers:

   - ds1307: stop disabling alarms on probe for DS1337, DS1339, DS1341
     and DS3231

   - max31335: add max31331 support

   - pcf50633 is removed as support for the related SoC has been removed

   - pcf85063: properly handle POR failures"

* tag 'rtc-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (50 commits)
  rtc: remove 'setdate' test program
  selftest: rtc: skip some tests if the alarm only supports minutes
  rtc: mt6397: drop unused defines
  rtc: pcf85063: replace dev_err+return with return dev_err_probe
  rtc: pcf85063: do a SW reset if POR failed
  rtc: max31335: Add driver support for max31331
  dt-bindings: rtc: max31335: Add max31331 support
  rtc: cros-ec: Avoid a couple of -Wflex-array-member-not-at-end warnings
  dt-bindings: rtc: pcf2127: Reference spi-peripheral-props.yaml
  rtc: rzn1: implement one-second accuracy for alarms
  rtc: pcf50633: Remove
  rtc: pm8xxx: implement qcom,no-alarm flag for non-HLOS owned alarm
  rtc: pm8xxx: mitigate flash wear
  rtc: pm8xxx: add support for uefi offset
  dt-bindings: rtc: qcom-pm8xxx: document qcom,no-alarm flag
  rtc: rv3032: drop WADA
  rtc: rv3032: fix EERD location
  rtc: pm8xxx: switch to devm_device_init_wakeup
  rtc: pm8xxx: fix possible race condition
  rtc: mpfs: switch to devm_device_init_wakeup
  ...
parents e8b47128 424dfcd4

Documentation/devicetree/bindings/rtc/adi,max31335.yaml

+3 −1
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ allOf: 


properties:

  compatible:

    const: adi,max31335

    enum:

      - adi,max31331

      - adi,max31335



  reg:

    maxItems: 1

Documentation/devicetree/bindings/rtc/nxp,pcf2127.yaml

+2 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ title: NXP PCF2127 Real Time Clock 


allOf:

  - $ref: rtc.yaml#

  - $ref: /schemas/spi/spi-peripheral-props.yaml#



maintainers:

  - Alexandre Belloni <alexandre.belloni@bootlin.com>
@@ -34,7 +35,7 @@ required: 
  - compatible

  - reg



additionalProperties: false

unevaluatedProperties: false



examples:

  - |

Documentation/devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml

+5 −0
Original line number Diff line number Diff line
@@ -50,6 +50,11 @@ properties: 
    items:

      - const: offset



  qcom,no-alarm:

    type: boolean

    description:

      RTC alarm is not owned by the OS



  wakeup-source: true



required:

drivers/rtc/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -1321,13 +1321,6 @@ config RTC_DRV_SPEAR 
	 If you say Y here you will get support for the RTC found on

	 spear



config RTC_DRV_PCF50633

	depends on MFD_PCF50633

	tristate "NXP PCF50633 RTC"

	help

	  If you say yes here you get support for the RTC subsystem of the

	  NXP PCF50633 used in embedded systems.



config RTC_DRV_AB8500

	tristate "ST-Ericsson AB8500 RTC"

	depends on AB8500_CORE

drivers/rtc/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -126,7 +126,6 @@ obj-$(CONFIG_RTC_DRV_PALMAS) += rtc-palmas.o 
obj-$(CONFIG_RTC_DRV_PCAP)	+= rtc-pcap.o

obj-$(CONFIG_RTC_DRV_PCF2123)	+= rtc-pcf2123.o

obj-$(CONFIG_RTC_DRV_PCF2127)	+= rtc-pcf2127.o

obj-$(CONFIG_RTC_DRV_PCF50633)	+= rtc-pcf50633.o

obj-$(CONFIG_RTC_DRV_PCF85063)	+= rtc-pcf85063.o

obj-$(CONFIG_RTC_DRV_PCF8523)	+= rtc-pcf8523.o

obj-$(CONFIG_RTC_DRV_PCF85363)	+= rtc-pcf85363.o