From: Huang, Tao <huangtao@rock-chips.com>
Date: Mon, 6 Jun 2016 09:26:55 +0000 (+0800)
Subject: Revert "clocksource: rockchip: remove unnecessary clear irq before request_irq"
X-Git-Tag: firefly_0821_release~2390
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=142baf7d610b0951d00f592ac82b04802f4ae977;p=firefly-linux-kernel-4.4.55.git

Revert "clocksource: rockchip: remove unnecessary clear irq before request_irq"

This reverts commit c380160aeae8b786868bd8483b9c1c9f22d15b61.

Change-Id: I435f0989976627e9892ff2bdba91cf41b8b77ef9
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
---

diff --git a/drivers/clocksource/rockchip_timer.c b/drivers/clocksource/rockchip_timer.c
index b93fed6533c6..b991b288c803 100644
--- a/drivers/clocksource/rockchip_timer.c
+++ b/drivers/clocksource/rockchip_timer.c
@@ -158,6 +158,9 @@ static void __init rk_timer_init(struct device_node *np)
 	ce->cpumask = cpumask_of(0);
 	ce->rating = 250;
 
+	rk_timer_interrupt_clear(ce);
+	rk_timer_disable(ce);
+
 	ret = request_irq(irq, rk_timer_interrupt, IRQF_TIMER, TIMER_NAME, ce);
 	if (ret) {
 		pr_err("Failed to initialize '%s': %d\n", TIMER_NAME, ret);