rtc: sh: assign correct interrupts with DT

[ Upstream commit 8f2efdbc303fe7baa83843d3290dd6ea5ba3276c ]

The DT bindings for this driver define the interrupts in the order as
they are numbered in the interrupt controller. The old platform_data,
however, listed them in a different order. So, for DT based platforms,
they are mixed up. Assign them specifically for DT, so we can keep the
bindings stable. After the fix, 'rtctest' passes again on the Renesas
Genmai board (RZ-A1 / R7S72100).

Fixes: dab5aec64b ("rtc: sh: add support for rza series")
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20250227134256.9167-11-wsa+renesas@sang-engineering.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Wolfram Sang
2025-02-27 14:42:56 +01:00
committed by Greg Kroah-Hartman
parent 848d78e362
commit 2e6d9128fe

View File

@@ -485,9 +485,15 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
return -ENOENT; return -ENOENT;
} }
rtc->periodic_irq = ret; if (!pdev->dev.of_node) {
rtc->carry_irq = platform_get_irq(pdev, 1); rtc->periodic_irq = ret;
rtc->alarm_irq = platform_get_irq(pdev, 2); rtc->carry_irq = platform_get_irq(pdev, 1);
rtc->alarm_irq = platform_get_irq(pdev, 2);
} else {
rtc->alarm_irq = ret;
rtc->periodic_irq = platform_get_irq(pdev, 1);
rtc->carry_irq = platform_get_irq(pdev, 2);
}
res = platform_get_resource(pdev, IORESOURCE_IO, 0); res = platform_get_resource(pdev, IORESOURCE_IO, 0);
if (!res) if (!res)