c9ae111a20
This is a backport of the patches accepted to the Linux mainline related to mvebu SoC (Armada XP and Armada 370) between Linux v3.12, and Linux v3.13. This work mainly covers: * Finishes work for sharing the pxa nand driver(drivers/mtd/nand/pxa3xx_nand.c) between the PXA family, and the Armada family. * timer initialization update, and access function for the Armada family. * Generic IRQ handling backporting. * Some bug fixes. Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com> CC: Luka Perkov <luka@openwrt.org> SVN-Revision: 39566
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
From bcaac3d9265d751f7d20df6ed0ac24241308dff7 Mon Sep 17 00:00:00 2001
|
|
From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Date: Tue, 20 Aug 2013 12:45:52 -0300
|
|
Subject: [PATCH 169/203] clocksource: armada-370-xp: Replace WARN_ON with
|
|
BUG_ON
|
|
|
|
If the clock fails to be obtained and the timer fails to be properly
|
|
registered, the kernel will freeze real soon. Instead, let's BUG()
|
|
where the actual problem is located.
|
|
|
|
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
|
|
Acked-by: Jason Cooper <jason@lakedaemon.net>
|
|
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
|
|
---
|
|
drivers/clocksource/time-armada-370-xp.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/clocksource/time-armada-370-xp.c
|
|
+++ b/drivers/clocksource/time-armada-370-xp.c
|
|
@@ -306,7 +306,7 @@ static void __init armada_370_timer_init
|
|
{
|
|
struct clk *clk = of_clk_get(np, 0);
|
|
|
|
- WARN_ON(IS_ERR(clk));
|
|
+ BUG_ON(IS_ERR(clk));
|
|
timer_clk = clk_get_rate(clk) / TIMER_DIVIDER;
|
|
timer25Mhz = false;
|
|
|