summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/board-dt-sama5.c
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2014-07-01 11:33:18 +0200
committerNicolas Ferre <nicolas.ferre@atmel.com>2014-09-03 10:55:22 +0200
commitf807a89cfe3e7379ec501810d67a5888edbb94f1 (patch)
tree43882348a1236b368ab46c5c15929087757ebdc9 /arch/arm/mach-at91/board-dt-sama5.c
parentARM: at91: PIT: Use of_have_populated_dt instead of CONFIG_OF (diff)
downloadlinux-f807a89cfe3e7379ec501810d67a5888edbb94f1.tar.xz
linux-f807a89cfe3e7379ec501810d67a5888edbb94f1.zip
ARM: at91: PIT: Rework probe functions
The PIT timer driver until now had a single probe function, disregarding wether it was probed through DT or in the old-style way. This code later on was calling some DT function to retrieve the proper values for its base address, interrupts and clocks. While this was working, it was preventing the usage of CLOCKSOURCE_OF_DECLARE, and the two different probe path were not as clearly separated as they could be. Rework the probe path to take this into account, and switch to CLOCKSOURCE_OF_DECLARE. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Boris BREZILLON <boris.brezillon@free-electrons.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91/board-dt-sama5.c')
-rw-r--r--arch/arm/mach-at91/board-dt-sama5.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-dt-sama5.c b/arch/arm/mach-at91/board-dt-sama5.c
index d6fe04bcaabd..4f01e34fae0a 100644
--- a/arch/arm/mach-at91/board-dt-sama5.c
+++ b/arch/arm/mach-at91/board-dt-sama5.c
@@ -17,6 +17,7 @@
#include <linux/of_platform.h>
#include <linux/phy.h>
#include <linux/clk-provider.h>
+#include <linux/clocksource.h>
#include <asm/setup.h>
#include <asm/irq.h>
@@ -32,7 +33,7 @@ static void __init sama5_dt_timer_init(void)
#if defined(CONFIG_COMMON_CLK)
of_clk_init(NULL);
#endif
- at91sam926x_pit_init();
+ clocksource_of_init();
}
static int ksz9021rn_phy_fixup(struct phy_device *phy)