Skip to content

Commit dc57604

Browse files
committed
Merge tag 'tags/fpga-rtc-260609' into linux-6.18-mchp
FPGA rtc updates for 260609 * rtc: mpfs: fix counter upload completion condition (Conor Dooley 2026-05-13) Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
2 parents cb1a91e + 78a92c6 commit dc57604

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/rtc/rtc-mpfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ static int mpfs_rtc_settime(struct device *dev, struct rtc_time *tm)
112112
ctrl |= CONTROL_UPLOAD_BIT;
113113
writel(ctrl, rtcdev->base + CONTROL_REG);
114114

115-
ret = read_poll_timeout(readl, prog, prog & CONTROL_UPLOAD_BIT, 0, UPLOAD_TIMEOUT_US,
115+
ret = read_poll_timeout(readl, prog, !(prog & CONTROL_UPLOAD_BIT), 0, UPLOAD_TIMEOUT_US,
116116
false, rtcdev->base + CONTROL_REG);
117117
if (ret) {
118118
dev_err(dev, "timed out uploading time to rtc");

0 commit comments

Comments
 (0)