Skip to content

Commit d204e39

Browse files
prabhakarladdlezcano
authored andcommitted
clocksource/drivers/renesas-ostm: Unconditionally enable reprobe support
Previously, the OSTM driver's platform probe path was only enabled for selected SoCs (e.g., RZ/G2L and RZ/V2H) due to issues on RZ/Ax (ARM32) SoCs, which encountered IRQ conflicts like: /soc/timer@e803b000: used for clock events genirq: Flags mismatch irq 16. 00215201 (timer@e803c000) vs. 00215201 (timer@e803c000) Failed to request irq 16 for /soc/timer@e803c000 renesas_ostm e803c000.timer: probe with driver renesas_ostm failed with error -16 These issues have since been resolved by commit 37385c0 ("clocksource/drivers/renesas-ostm: Avoid reprobe after successful early probe"), which prevents reprobe on successfully initialized early timers. With this fix in place, there is no longer a need to restrict platform probing based on SoC-specific configs. This change unconditionally enables reprobe support for all SoCs, simplifying the logic and avoiding the need to update the configuration for every new Renesas SoC with OSTM. Additionally, the `ostm_of_table` is now marked with `__maybe_unused` to fix a build warning when `CONFIG_OF` is disabled. RZ/A1 and RZ/A2 remain unaffected with this change. Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Tested-by: Geert Uytterhoeven <geert+renesas@glider.be> Link: https://lore.kernel.org/r/20250515182207.329176-3-prabhakar.mahadev-lad.rj@bp.renesas.com Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
1 parent f0e0c37 commit d204e39

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

drivers/clocksource/renesas-ostm.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,15 +225,14 @@ static int __init ostm_init(struct device_node *np)
225225

226226
TIMER_OF_DECLARE(ostm, "renesas,ostm", ostm_init);
227227

228-
#if defined(CONFIG_ARCH_RZG2L) || defined(CONFIG_ARCH_R9A09G057)
229228
static int __init ostm_probe(struct platform_device *pdev)
230229
{
231230
struct device *dev = &pdev->dev;
232231

233232
return ostm_init(dev->of_node);
234233
}
235234

236-
static const struct of_device_id ostm_of_table[] = {
235+
static const struct of_device_id __maybe_unused ostm_of_table[] = {
237236
{ .compatible = "renesas,ostm", },
238237
{ /* sentinel */ }
239238
};
@@ -246,4 +245,3 @@ static struct platform_driver ostm_device_driver = {
246245
},
247246
};
248247
builtin_platform_driver_probe(ostm_device_driver, ostm_probe);
249-
#endif

0 commit comments

Comments
 (0)