Skip to content

Commit a98399c

Browse files
Andre-ARMdlezcano
authored andcommitted
clocksource/drivers/sp804: Avoid error on multiple instances
When a machine sports more than one SP804 timer instance, we only bring up the first one, since multiple timers of the same kind are not useful to Linux. As this is intentional behaviour, we should not return an error message, as we do today: =============== [ 0.000800] Failed to initialize '/bus@8000000/motherboard-bus@8000000/iofpga-bus@300000000/timer@120000': -22 =============== Replace the -EINVAL return with a debug message and return 0 instead. Also we do not reach the init function anymore if the DT node is disabled (as this is now handled by OF_DECLARE), so remove the explicit check for that case. This fixes a long standing bogus error when booting ARM's fastmodels. Signed-off-by: Andre Przywara <[email protected]> Reviewed-by: Robin Murphy <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Daniel Lezcano <[email protected]>
1 parent 232ccac commit a98399c

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/clocksource/timer-sp804.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,11 @@ static int __init sp804_of_init(struct device_node *np, struct sp804_timer *time
259259
struct clk *clk1, *clk2;
260260
const char *name = of_get_property(np, "compatible", NULL);
261261

262+
if (initialized) {
263+
pr_debug("%pOF: skipping further SP804 timer device\n", np);
264+
return 0;
265+
}
266+
262267
base = of_iomap(np, 0);
263268
if (!base)
264269
return -ENXIO;
@@ -270,11 +275,6 @@ static int __init sp804_of_init(struct device_node *np, struct sp804_timer *time
270275
writel(0, timer1_base + timer->ctrl);
271276
writel(0, timer2_base + timer->ctrl);
272277

273-
if (initialized || !of_device_is_available(np)) {
274-
ret = -EINVAL;
275-
goto err;
276-
}
277-
278278
clk1 = of_clk_get(np, 0);
279279
if (IS_ERR(clk1))
280280
clk1 = NULL;

0 commit comments

Comments
 (0)