From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 Feb 2026 17:43:11 +0000 (-0800)
Subject: Merge tag 'rtc-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
X-Git-Tag: v7.0-rc1~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f2eac7767493bf23e6552db82ab25de0dccd54f;p=thirdparty%2Fkernel%2Fstable.git

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

Pull RTC updates from Alexandre Belloni:

 - loongson: Loongson-2K0300 support

 - s35390a: nvmem support

 - zynqmp: rework calibration

* tag 'rtc-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  rtc: ds1390: fix number of bytes read from RTC
  rtc: class: Remove duplicate check for alarm
  rtc: optee: simplify OP-TEE context match
  rtc: interface: Alarm race handling should not discard preceding error
  rtc: s35390a: implement nvmem support
  rtc: loongson: Add Loongson-2K0300 support
  dt-bindings: rtc: loongson: Document Loongson-2K0300 compatible
  dt-bindings: rtc: loongson: Correct Loongson-1C interrupts property
  dt-bindings: rtc: renesas,rz-rtca3: Add RZ/V2N support
  dt-bindings: rtc: cpcap: convert to schema
  rtc: zynqmp: use dynamic max and min offset ranges
  rtc: zynqmp: rework set_offset
  rtc: zynqmp: rework read_offset
  rtc: zynqmp: check calibration max value
  rtc: zynqmp: correct frequency value
  rtc: amlogic-a4: Remove IRQF_ONESHOT
  rtc: pcf8563: use correct of_node for output clock
  rtc: max31335: use correct CONFIG symbol in IS_REACHABLE()
  rtc: nvvrs: Add ARCH_TEGRA to the NV VRS RTC driver
---

5f2eac7767493bf23e6552db82ab25de0dccd54f
diff --cc drivers/rtc/rtc-optee.c
index eefde789d1944,2f18be3de6847..6c908c0d861a6
--- a/drivers/rtc/rtc-optee.c
+++ b/drivers/rtc/rtc-optee.c
@@@ -541,15 -541,12 +541,12 @@@ static int optee_rtc_read_info(struct d
  
  static int optee_ctx_match(struct tee_ioctl_version_data *ver, const void *data)
  {
- 	if (ver->impl_id == TEE_IMPL_ID_OPTEE)
- 		return 1;
- 	else
- 		return 0;
+ 	return (ver->impl_id == TEE_IMPL_ID_OPTEE);
  }
  
 -static int optee_rtc_probe(struct device *dev)
 +static int optee_rtc_probe(struct tee_client_device *rtc_device)
  {
 -	struct tee_client_device *rtc_device = to_tee_client_device(dev);
 +	struct device *dev = &rtc_device->dev;
  	struct tee_ioctl_open_session_arg sess2_arg = {0};
  	struct tee_ioctl_open_session_arg sess_arg = {0};
  	struct optee_rtc *priv;