mvebu: backport mainline patches from kernel 3.12
[openwrt/staging/chunkeey.git] / target / linux / mvebu / patches-3.10 / 0084-arm-clocksource-mvebu-Use-the-main-timer-as-clock-so.patch
1 From 02b0213923da41034a766942508d882f9be51efd Mon Sep 17 00:00:00 2001
2 From: Jean Pihet <jean.pihet@linaro.org>
3 Date: Wed, 18 Sep 2013 20:55:09 +0200
4 Subject: [PATCH 084/203] arm: clocksource: mvebu: Use the main timer as clock
5 source from DT
6
7 This commit:
8 573145f08c2b92c45498468afbbba909f6ce6135
9 clocksource: armada-370-xp: Use CLOCKSOURCE_OF_DECLARE
10
11 replaced a call to the driver's timer initialization by a call to
12 clocksource_of_init(). However, it failed to select CONFIG_CLKSRC_OF.
13
14 Fix this by selecting CONFIG_CLKSRC_OF for Armada370/XP machines.
15 Without this change the kernel is stuck at: 'Calibrating delay loop...'.
16
17 Signed-off-by: Jean Pihet <jean.pihet@linaro.org>
18 Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
19 Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
20 ---
21 drivers/clocksource/Kconfig | 1 +
22 1 file changed, 1 insertion(+)
23
24 --- a/drivers/clocksource/Kconfig
25 +++ b/drivers/clocksource/Kconfig
26 @@ -24,6 +24,7 @@ config DW_APB_TIMER_OF
27
28 config ARMADA_370_XP_TIMER
29 bool
30 + select CLKSRC_OF
31
32 config SUN4I_TIMER
33 bool