diff options
| author | David Lechner <david@lechnology.com> | 2018-05-18 19:48:27 +0300 |
|---|---|---|
| committer | Sekhar Nori <nsekhar@ti.com> | 2018-06-26 13:48:10 +0300 |
| commit | 62604824d234ddf456dd4a97f52bcd0f4e534446 (patch) | |
| tree | 9b6192ac871ffca809cc63af4565cd6ff525ee20 /arch/arm | |
| parent | 88ff663d50e09fdb36dae41fdf803d01529e6883 (diff) | |
| download | linux-62604824d234ddf456dd4a97f52bcd0f4e534446.tar.xz | |
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: David Lechner <david@lechnology.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-davinci/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-davinci/time.c | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index ba9912b4dfab..da8a039d65f9 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig @@ -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 diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c index 7ea3db0ff062..5a6de5368ab0 100644 --- a/arch/arm/mach-davinci/time.c +++ b/arch/arm/mach-davinci/time.c @@ -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); |