Merge remote-tracking branch 'asoc/fix/sta32x' into asoc-linus

[firefly-linux-kernel-4.4.55.git] / drivers / clocksource / timer-sun5i.c

diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c
index deebcd6469fced2c9b131447b75085c887068b6d..02268448dc8540a9f53113f28c29e6a292209a5a 100644 (file)
--- a/drivers/clocksource/timer-sun5i.c
+++ b/drivers/clocksource/timer-sun5i.c
@@ -16,6 +16,7 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/irqreturn.h>
+#include <linux/reset.h>
 #include <linux/sched_clock.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
@@ -143,6 +144,7 @@ static u64 sun5i_timer_sched_read(void)
 
 static void __init sun5i_timer_init(struct device_node *node)
 {
+       struct reset_control *rstc;
        unsigned long rate;
        struct clk *clk;
        int ret, irq;
@@ -162,6 +164,10 @@ static void __init sun5i_timer_init(struct device_node *node)
        clk_prepare_enable(clk);
        rate = clk_get_rate(clk);
 
+       rstc = of_reset_control_get(node, NULL);
+       if (!IS_ERR(rstc))
+               reset_control_deassert(rstc);
+
        writel(~0, timer_base + TIMER_INTVAL_LO_REG(1));
        writel(TIMER_CTL_ENABLE | TIMER_CTL_RELOAD,
               timer_base + TIMER_CTL_REG(1));