Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cf31380 authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: SP804: make Integrator/CP timer pick clock from DT 



This modifies the SP804 driver so that the clock will be taken
from the device tree node for the timer.

Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Rob Herring <rob.herring@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent b7929852

arch/arm/common/timer-sp.c

+6 −2
Original line number Diff line number Diff line
@@ -271,10 +271,14 @@ static void __init integrator_cp_of_init(struct device_node *np) 
	void __iomem *base;

	int irq;

	const char *name = of_get_property(np, "compatible", NULL);

	struct clk *clk;



	base = of_iomap(np, 0);

	if (WARN_ON(!base))

		return;

	clk = of_clk_get(np, 0);

	if (WARN_ON(IS_ERR(clk)))

		return;



	/* Ensure timer is disabled */

	writel(0, base + TIMER_CTRL);
@@ -283,13 +287,13 @@ static void __init integrator_cp_of_init(struct device_node *np) 
		goto err;



	if (!init_count)

		sp804_clocksource_init(base, name);

		__sp804_clocksource_and_sched_clock_init(base, name, clk, 0);

	else {

		irq = irq_of_parse_and_map(np, 0);

		if (irq <= 0)

			goto err;



		sp804_clockevents_init(base, irq, name);

		__sp804_clockevents_init(base, irq, clk, name);

	}



	init_count++;