Skip to content

Commit

Permalink
clocksource/drivers/sp804: Avoid error on multiple instances
Browse files Browse the repository at this point in the history
[ Upstream commit a98399c ]

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 <andre.przywara@arm.com>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/20220506162522.3675399-1-andre.przywara@arm.com
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Andre-ARM authored and gregkh committed Jun 14, 2022
1 parent abf3b22 commit f3f754d
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/clocksource/timer-sp804.c
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,11 @@ static int __init sp804_of_init(struct device_node *np, struct sp804_timer *time
struct clk *clk1, *clk2;
const char *name = of_get_property(np, "compatible", NULL);

if (initialized) {
pr_debug("%pOF: skipping further SP804 timer device\n", np);
return 0;
}

base = of_iomap(np, 0);
if (!base)
return -ENXIO;
Expand All @@ -285,11 +290,6 @@ static int __init sp804_of_init(struct device_node *np, struct sp804_timer *time
writel(0, timer1_base + timer->ctrl);
writel(0, timer2_base + timer->ctrl);

if (initialized || !of_device_is_available(np)) {
ret = -EINVAL;
goto err;
}

clk1 = of_clk_get(np, 0);
if (IS_ERR(clk1))
clk1 = NULL;
Expand Down

0 comments on commit f3f754d

Please sign in to comment.