Commit 62604824 authored by David Lechner's avatar David Lechner Committed by Sekhar Nori
Browse files

ARM: davinci: add device tree support to timer 



This adds device tree support to the davinci timer so that when clocks
are moved to device tree, the timer will still work.

Signed-off-by: default avatarDavid Lechner <david@lechnology.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent 88ff663d

arch/arm/mach-davinci/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ config MACH_DA8XX_DT 
	default y

	depends on ARCH_DAVINCI_DA850

	select PINCTRL

	select TIMER_OF

	help

	  Say y here to include support for TI DaVinci DA850 based using

	  Flattened Device Tree. More information at Documentation/devicetree

arch/arm/mach-davinci/time.c

+15 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/io.h>

#include <linux/clk.h>

#include <linux/err.h>

#include <linux/of.h>

#include <linux/platform_device.h>

#include <linux/sched_clock.h>
@@ -397,3 +398,17 @@ void __init davinci_timer_init(struct clk *timer_clk) 
	for (i=0; i< ARRAY_SIZE(timers); i++)

		timer32_config(&timers[i]);

}



static int __init of_davinci_timer_init(struct device_node *np)

{

	struct clk *clk;



	clk = of_clk_get(np, 0);

	if (IS_ERR(clk))

		return PTR_ERR(clk);



	davinci_timer_init(clk);



	return 0;

}

TIMER_OF_DECLARE(davinci_timer, "ti,da830-timer", of_davinci_timer_init);