Merge tag 'platform-drivers-x86-v4.9-1' of git://git.infradead.org/users/dvhart/linux...

[cascardo/linux.git] / drivers / clocksource / timer-atmel-pit.c

diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c
index 7f0f5b2..6555821 100644 (file)
--- a/drivers/clocksource/timer-atmel-pit.c
+++ b/drivers/clocksource/timer-atmel-pit.c
@@ -149,24 +149,13 @@ static irqreturn_t at91sam926x_pit_interrupt(int irq, void *dev_id)
 {
        struct pit_data *data = dev_id;
 
-       /*
-        * irqs should be disabled here, but as the irq is shared they are only
-        * guaranteed to be off if the timer irq is registered first.
-        */
-       WARN_ON_ONCE(!irqs_disabled());
-
        /* The PIT interrupt may be disabled, and is shared */
        if (clockevent_state_periodic(&data->clkevt) &&
            (pit_read(data->base, AT91_PIT_SR) & AT91_PIT_PITS)) {
-               unsigned nr_ticks;
-
                /* Get number of ticks performed before irq, and ack it */
-               nr_ticks = PIT_PICNT(pit_read(data->base, AT91_PIT_PIVR));
-               do {
-                       data->cnt += data->cycle;
-                       data->clkevt.event_handler(&data->clkevt);
-                       nr_ticks--;
-               } while (nr_ticks);
+               data->cnt += data->cycle * PIT_PICNT(pit_read(data->base,
+                                                             AT91_PIT_PIVR));
+               data->clkevt.event_handler(&data->clkevt);
 
                return IRQ_HANDLED;
        }
@@ -177,11 +166,41 @@ static irqreturn_t at91sam926x_pit_interrupt(int irq, void *dev_id)
 /*
  * Set up both clocksource and clockevent support.
  */
-static int __init at91sam926x_pit_common_init(struct pit_data *data)
+static int __init at91sam926x_pit_dt_init(struct device_node *node)
 {
-       unsigned long   pit_rate;
-       unsigned        bits;
-       int             ret;
+       unsigned long   pit_rate;
+       unsigned        bits;
+       int             ret;
+       struct pit_data *data;
+
+       data = kzalloc(sizeof(*data), GFP_KERNEL);
+       if (!data)
+               return -ENOMEM;
+
+       data->base = of_iomap(node, 0);
+       if (!data->base) {
+               pr_err("Could not map PIT address\n");
+               return -ENXIO;
+       }
+
+       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 = clk_prepare_enable(data->mck);
+       if (ret) {
+               pr_err("Unable to enable mck\n");
+               return ret;
+       }
+
+       /* 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;
+       }
 
        /*
         * Use our actual MCK to figure out how many MCK/16 ticks per
@@ -236,46 +255,5 @@ static int __init at91sam926x_pit_common_init(struct pit_data *data)
 
        return 0;
 }
-
-static int __init at91sam926x_pit_dt_init(struct device_node *node)
-{
-       struct pit_data *data;
-       int ret;
-
-       data = kzalloc(sizeof(*data), GFP_KERNEL);
-       if (!data)
-               return -ENOMEM;
-
-       data->base = of_iomap(node, 0);
-       if (!data->base) {
-               pr_err("Could not map PIT address\n");
-               return -ENXIO;
-       }
-
-       data->mck = of_clk_get(node, 0);
-       if (IS_ERR(data->mck))
-               /* Fallback on clkdev for !CCF-based boards */
-               data->mck = clk_get(NULL, "mck");
-
-       if (IS_ERR(data->mck)) {
-               pr_err("Unable to get mck clk\n");
-               return PTR_ERR(data->mck);
-       }
-
-       ret = clk_prepare_enable(data->mck);
-       if (ret) {
-               pr_err("Unable to enable mck\n");
-               return ret;
-       }
-
-       /* 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;
-       }
-
-       return at91sam926x_pit_common_init(data);
-}
 CLOCKSOURCE_OF_DECLARE(at91sam926x_pit, "atmel,at91sam9260-pit",
                       at91sam926x_pit_dt_init);