Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Thomas writes:
  "Three small fixes for clocksource drivers:
   - Proper error handling in the Atmel PIT driver
   - Add CLOCK_SOURCE_SUSPEND_NONSTOP for TI SoCs so suspend works again
   - Fix the next event function for Facebook Backpack-CMM BMC chips so
     usleep(100) doesnt sleep several milliseconds"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource/drivers/timer-atmel-pit: Properly handle error cases
  clocksource/drivers/fttmr010: Fix set_next_event handler
  clocksource/drivers/ti-32k: Add CLOCK_SOURCE_SUSPEND_NONSTOP flag for non-am43 SoCs

3 files changed, 28 insertions, 13 deletions

diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c
index ec8a4376f74f..2fab18fae4fc 100644
--- a/drivers/clocksource/timer-atmel-pit.c
+++ b/drivers/clocksource/timer-atmel-pit.c
@@ -180,26 +180,29 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node)
         data->base = of_iomap(node, 0);
         if (!data->base) {
                 pr_err("Could not map PIT address\n");
-                return -ENXIO;
+                ret = -ENXIO;
+                goto exit;
         }
 
         data->mck = of_clk_get(node, 0);
         if (IS_ERR(data->mck)) {
                 pr_err("Unable to get mck clk\n");
-                return PTR_ERR(data->mck);
+                ret = PTR_ERR(data->mck);
+                goto exit;
         }
 
         ret = clk_prepare_enable(data->mck);
         if (ret) {
                 pr_err("Unable to enable mck\n");
-                return ret;
+                goto exit;
         }
 
         /* Get the interrupts property */
         data->irq = irq_of_parse_and_map(node, 0);
         if (!data->irq) {
                 pr_err("Unable to get IRQ from DT\n");
-                return -EINVAL;
+                ret = -EINVAL;
+                goto exit;
         }
 
         /*
@@ -227,7 +230,7 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node)
         ret = clocksource_register_hz(&data->clksrc, pit_rate);
         if (ret) {
                 pr_err("Failed to register clocksource\n");
-                return ret;
+                goto exit;
         }
 
         /* Set up irq handler */
@@ -236,7 +239,8 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node)
                           "at91_tick", data);
         if (ret) {
                 pr_err("Unable to setup IRQ\n");
-                return ret;
+                clocksource_unregister(&data->clksrc);
+                goto exit;
         }
 
         /* Set up and register clockevents */
@@ -254,6 +258,10 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node)
         clockevents_register_device(&data->clkevt);
 
         return 0;
+
+exit:
+        kfree(data);
+        return ret;
 }
 TIMER_OF_DECLARE(at91sam926x_pit, "atmel,at91sam9260-pit",
                        at91sam926x_pit_dt_init);
diff --git a/drivers/clocksource/timer-fttmr010.c b/drivers/clocksource/timer-fttmr010.c
index c020038ebfab..cf93f6419b51 100644
--- a/drivers/clocksource/timer-fttmr010.c
+++ b/drivers/clocksource/timer-fttmr010.c
@@ -130,13 +130,17 @@ static int fttmr010_timer_set_next_event(unsigned long cycles,
         cr &= ~fttmr010->t1_enable_val;
         writel(cr, fttmr010->base + TIMER_CR);
 
-        /* Setup the match register forward/backward in time */
-        cr = readl(fttmr010->base + TIMER1_COUNT);
-        if (fttmr010->count_down)
-                cr -= cycles;
-        else
-                cr += cycles;
-        writel(cr, fttmr010->base + TIMER1_MATCH1);
+        if (fttmr010->count_down) {
+                /*
+                 * ASPEED Timer Controller will load TIMER1_LOAD register
+                 * into TIMER1_COUNT register when the timer is re-enabled.
+                 */
+                writel(cycles, fttmr010->base + TIMER1_LOAD);
+        } else {
+                /* Setup the match register forward in time */
+                cr = readl(fttmr010->base + TIMER1_COUNT);
+                writel(cr + cycles, fttmr010->base + TIMER1_MATCH1);
+        }
 
         /* Start */
         cr = readl(fttmr010->base + TIMER_CR);
diff --git a/drivers/clocksource/timer-ti-32k.c b/drivers/clocksource/timer-ti-32k.c
index 29e2e1a78a43..6949a9113dbb 100644
--- a/drivers/clocksource/timer-ti-32k.c
+++ b/drivers/clocksource/timer-ti-32k.c
@@ -97,6 +97,9 @@ static int __init ti_32k_timer_init(struct device_node *np)
                 return -ENXIO;
         }
 
+        if (!of_machine_is_compatible("ti,am43"))
+                ti_32k_timer.cs.flags |= CLOCK_SOURCE_SUSPEND_NONSTOP;
+
         ti_32k_timer.counter = ti_32k_timer.base;
 
         /*