Merge tag 'rtc-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux (f4a2f786) · Commits · 戴 / test

Pull RTC updates from Alexandre Belloni: "Subsystem: - Remove nvram ABI. There was no complaints about the deprecation for the last 3 years. - Improve RTC device allocation and registration - Now available for ARCH=um Drivers: - at91rm9200: correction and sam9x60 support - ds1307: improve ACPI support - mxc: now DT only - pcf2127: watchdog support now needs the reset-source property - pcf8523: set range - rx6110: i2c support" * tag 'rtc-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (43 commits) rtc: pcf2127: only use watchdog when explicitly available dt-bindings: rtc: add reset-source property rtc: fix RTC removal rtc: s3c: Remove dead code related to periodic tick handling rtc: s3c: Disable all enable (RTC, tick) bits in the probe rtc: ep93xx: Fix NULL pointer dereference in ep93xx_rtc_read_time rtc: test: remove debug message rtc: mxc{,_v2}: enable COMPILE_TEST rtc: enable RTC framework on ARCH=um rtc: pcf8523: use BIT rtc: pcf8523: set range rtc: pcf8523: switch to devm_rtc_allocate_device rtc: destroy mutex when releasing the device rtc: shrink devm_rtc_allocate_device() rtc: rework rtc_register_device() resource management rtc: nvmem: emit an error message when nvmem registration fails rtc: add devm_ prefix to rtc_nvmem_register() rtc: nvmem: remove nvram ABI Documentation: list RTC devres helpers in devres.rst rtc: omap: use devm_pinctrl_register() ...

Documentation/devicetree/bindings/rtc/rtc.yaml

+5 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,11 @@ properties:
		description:
		Enables wake up of host system on alarm.

		reset-source:
		$ref: /schemas/types.yaml#/definitions/flag
		description:
		The RTC is able to reset the machine.

		additionalProperties: true

		...

Documentation/driver-api/driver-model/devres.rst

+6 −0

Original line number	Diff line number	Diff line
		@@ -411,6 +411,12 @@ RESET
		devm_reset_control_get()
		devm_reset_controller_register()

		RTC
		devm_rtc_device_register()
		devm_rtc_allocate_device()
		devm_rtc_register_device()
		devm_rtc_nvmem_register()

		SERDEV
		devm_serdev_device_open()

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -1183,7 +1183,7 @@ F: Documentation/devicetree/bindings/interrupt-controller/google,goldfish-pic.tx
		F: drivers/irqchip/irq-goldfish-pic.c

		ANDROID GOLDFISH RTC DRIVER
		M: Miodrag Dinic <miodrag.dinic@mips.com>
		M: Jiaxun Yang <jiaxun.yang@flygoat.com>
		S: Supported
		F: Documentation/devicetree/bindings/rtc/google,goldfish-rtc.txt
		F: drivers/rtc/rtc-goldfish.c

arch/alpha/kernel/rtc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -216,6 +216,6 @@ alpha_rtc_init(void)
		rtc->ops = &remote_rtc_ops;
		#endif

		return rtc_register_device(rtc);
		return devm_rtc_register_device(rtc);
		}
		device_initcall(alpha_rtc_init);

drivers/mfd/menelaus.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1119,7 +1119,7 @@ static inline void menelaus_rtc_init(struct menelaus_chip *m)
		menelaus_write_reg(MENELAUS_RTC_CTRL, m->rtc_control);
		}

		err = rtc_register_device(m->rtc);
		err = devm_rtc_register_device(m->rtc);
		if (err) {
		if (alarm) {
		menelaus_remove_irq_work(MENELAUS_RTCALM_IRQ);

Admin message