3af779eb17
This is a backport of the patches accepted to the Linux mainline related to mvebu SoC (Armada XP and Armada 370) between Linux v3.11, and Linux v3.12. This work mainly covers: * Ground work for sharing the pxa nand driver(drivers/mtd/nand/pxa3xx_nand.c) between the PXA family,and the Armada family. * Further updates to the mvebu MBus. * Work and ground work for enabling MSI on the Armada family. * some phy / mdio bus initialization related work. * Device tree binding documentation update. Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com> CC: Luka Perkov <luka@openwrt.org> SVN-Revision: 39565
34 lines
1.0 KiB
Diff
34 lines
1.0 KiB
Diff
From 02b0213923da41034a766942508d882f9be51efd Mon Sep 17 00:00:00 2001
|
|
From: Jean Pihet <jean.pihet@linaro.org>
|
|
Date: Wed, 18 Sep 2013 20:55:09 +0200
|
|
Subject: [PATCH 084/203] arm: clocksource: mvebu: Use the main timer as clock
|
|
source from DT
|
|
|
|
This commit:
|
|
573145f08c2b92c45498468afbbba909f6ce6135
|
|
clocksource: armada-370-xp: Use CLOCKSOURCE_OF_DECLARE
|
|
|
|
replaced a call to the driver's timer initialization by a call to
|
|
clocksource_of_init(). However, it failed to select CONFIG_CLKSRC_OF.
|
|
|
|
Fix this by selecting CONFIG_CLKSRC_OF for Armada370/XP machines.
|
|
Without this change the kernel is stuck at: 'Calibrating delay loop...'.
|
|
|
|
Signed-off-by: Jean Pihet <jean.pihet@linaro.org>
|
|
Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
|
|
---
|
|
drivers/clocksource/Kconfig | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
--- a/drivers/clocksource/Kconfig
|
|
+++ b/drivers/clocksource/Kconfig
|
|
@@ -24,6 +24,7 @@ config DW_APB_TIMER_OF
|
|
|
|
config ARMADA_370_XP_TIMER
|
|
bool
|
|
+ select CLKSRC_OF
|
|
|
|
config SUN4I_TIMER
|
|
bool
|