diff options
| author |   Bartosz Golaszewski <bgolaszewski@baylibre.com> | 2019-07-22 15:17:39 +0200 |
|---|---|---|
| committer |   Sekhar Nori <nsekhar@ti.com> | 2019-08-08 00:22:48 +0530 |
| commit | 29e97f56f2ee0dd5dbd0f7a0a698f2cdcaf54c79 (patch) | |
| tree | 1257f66073220e8a19c88f54e85774bdd412e7d6 /arch/arm | |
| parent | Linus 5.3-rc1 (diff) | |
| download | linux-dev-29e97f56f2ee0dd5dbd0f7a0a698f2cdcaf54c79.tar.xz linux-dev-29e97f56f2ee0dd5dbd0f7a0a698f2cdcaf54c79.zip | |
ARM: davinci: enable the clocksource driver for DT mode
Switch all davinci boards supporting device tree to using the new
clocksource driver: remove the previous OF_TIMER_DECLARE() from
mach-davinci and select davinci-timer for ARCH_DAVINCI.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: David Lechner <david@lechnology.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-davinci/time.c | 14 |
2 files changed, 1 insertions, 14 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 33b00579beff..92ff58be1a43 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -583,6 +583,7 @@ config ARCH_DAVINCI select ARCH_HAS_HOLES_MEMORYMODEL select COMMON_CLK select CPU_ARM926T + select DAVINCI_TIMER select GENERIC_ALLOCATOR select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c index 5a6de5368ab0..740410a3bb6a 100644 --- a/arch/arm/mach-davinci/time.c +++ b/arch/arm/mach-davinci/time.c @@ -398,17 +398,3 @@ 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); |