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

Commit 870e2928 authored by Rob Herring's avatar Rob Herring
Browse files

ARM: integrator-cp: convert use CLKSRC_OF for timer init 



Move the integrator-cp timer init to timer-sp.c and use CLKSRC_OF. There is
no reason to use the aliases, so drop them from the init code.

The integrator-cp timers are mistakenly called sp804 timers in the dts, but
in fact they are not sp804 dual timers, but single timers with the same
programming model. Fix the dts to reflect this.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 818270d5

arch/arm/boot/dts/integratorcp.dts

+3 −3
Original line number Diff line number Diff line
@@ -24,15 +24,15 @@ 
	};



	timer0: timer@13000000 {

		compatible = "arm,sp804", "arm,primecell";

		compatible = "arm,integrator-cp-timer";

	};



	timer1: timer@13000100 {

		compatible = "arm,sp804", "arm,primecell";

		compatible = "arm,integrator-cp-timer";

	};



	timer2: timer@13000200 {

		compatible = "arm,sp804", "arm,primecell";

		compatible = "arm,integrator-cp-timer";

	};



	pic: pic@14000000 {

arch/arm/common/timer-sp.c

+35 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 


#include <asm/sched_clock.h>

#include <asm/hardware/arm_timer.h>

#include <asm/hardware/timer-sp.h>



static long __init sp804_get_clock_rate(struct clk *clk)

{
@@ -262,3 +263,37 @@ static void __init sp804_of_init(struct device_node *np) 
	iounmap(base);

}

CLOCKSOURCE_OF_DECLARE(sp804, "arm,sp804", sp804_of_init);



static void __init integrator_cp_of_init(struct device_node *np)

{

	static int init_count = 0;

	void __iomem *base;

	int irq;

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



	base = of_iomap(np, 0);

	if (WARN_ON(!base))

		return;



	/* Ensure timer is disabled */

	writel(0, base + TIMER_CTRL);



	if (init_count == 2 || !of_device_is_available(np))

		goto err;



	if (!init_count)

		sp804_clocksource_init(base, name);

	else {

		irq = irq_of_parse_and_map(np, 0);

		if (irq <= 0)

			goto err;



		sp804_clockevents_init(base, irq, name);

	}



	init_count++;

	return;

err:

	iounmap(base);

}

CLOCKSOURCE_OF_DECLARE(intcp, "arm,integrator-cp-timer", integrator_cp_of_init);

arch/arm/mach-integrator/integrator_cp.c

+0 −34
Original line number Diff line number Diff line
@@ -250,39 +250,6 @@ static void __init intcp_init_early(void) 
}



#ifdef CONFIG_OF



static void __init cp_of_timer_init(void)

{

	struct device_node *node;

	const char *path;

	void __iomem *base;

	int err;

	int irq;



	err = of_property_read_string(of_aliases,

				"arm,timer-primary", &path);

	if (WARN_ON(err))

		return;

	node = of_find_node_by_path(path);

	base = of_iomap(node, 0);

	if (WARN_ON(!base))

		return;

	writel(0, base + TIMER_CTRL);

	sp804_clocksource_init(base, node->name);



	err = of_property_read_string(of_aliases,

				"arm,timer-secondary", &path);

	if (WARN_ON(err))

		return;

	node = of_find_node_by_path(path);

	base = of_iomap(node, 0);

	if (WARN_ON(!base))

		return;

	irq = irq_of_parse_and_map(node, 0);

	writel(0, base + TIMER_CTRL);

	sp804_clockevents_init(base, irq, node->name);

}



static const struct of_device_id fpga_irq_of_match[] __initconst = {

	{ .compatible = "arm,versatile-fpga-irq", .data = fpga_irq_of_init, },

	{ /* Sentinel */ }
@@ -386,7 +353,6 @@ DT_MACHINE_START(INTEGRATOR_CP_DT, "ARM Integrator/CP (Device Tree)") 
	.init_early	= intcp_init_early,

	.init_irq	= intcp_init_irq_of,

	.handle_irq	= fpga_handle_irq,

	.init_time	= cp_of_timer_init,

	.init_machine	= intcp_init_of,

	.restart	= integrator_restart,

	.dt_compat      = intcp_dt_board_compat,