Commit a98399cb authored by Andre Przywara's avatar Andre Przywara Committed by Daniel Lezcano
Browse files

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: default avatarAndre Przywara <andre.przywara@arm.com>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/20220506162522.3675399-1-andre.przywara@arm.com


Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 232ccac1

drivers/clocksource/timer-sp804.c

+5 −5
Original line number Diff line number Diff line
@@ -259,6 +259,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;
@@ -270,11 +275,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;