Skip to content

Commit

Permalink
ARM: davinci: add device tree support to timer
Browse files Browse the repository at this point in the history
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: David Lechner <david@lechnology.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
  • Loading branch information
dlech authored and nsekhar committed Jun 26, 2018
1 parent 88ff663 commit 6260482
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
1 change: 1 addition & 0 deletions arch/arm/mach-davinci/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 15 additions & 0 deletions arch/arm/mach-davinci/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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);

0 comments on commit 6260482

Please sign in to comment.