These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git] / kernel / drivers / clocksource / timer-atmel-st.c
index 306e205..103d0fd 100644 (file)
@@ -22,6 +22,7 @@
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
+#include <linux/clk.h>
 #include <linux/clockchips.h>
 #include <linux/export.h>
 #include <linux/mfd/syscon.h>
@@ -33,9 +34,7 @@ static unsigned long last_crtr;
 static u32 irqmask;
 static struct clock_event_device clkevt;
 static struct regmap *regmap_st;
-
-#define AT91_SLOW_CLOCK                32768
-#define RM9200_TIMER_LATCH     ((AT91_SLOW_CLOCK + HZ/2) / HZ)
+static int timer_latch;
 
 /*
  * The ST_CRTR is updated asynchronously to the master clock ... but
@@ -82,8 +81,8 @@ static irqreturn_t at91rm9200_timer_interrupt(int irq, void *dev_id)
        if (sr & AT91_ST_PITS) {
                u32     crtr = read_CRTR();
 
-               while (((crtr - last_crtr) & AT91_ST_CRTV) >= RM9200_TIMER_LATCH) {
-                       last_crtr += RM9200_TIMER_LATCH;
+               while (((crtr - last_crtr) & AT91_ST_CRTV) >= timer_latch) {
+                       last_crtr += timer_latch;
                        clkevt.event_handler(&clkevt);
                }
                return IRQ_HANDLED;
@@ -106,37 +105,66 @@ static struct clocksource clk32k = {
        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
-static void
-clkevt32k_mode(enum clock_event_mode mode, struct clock_event_device *dev)
+static void clkdev32k_disable_and_flush_irq(void)
 {
        unsigned int val;
 
        /* Disable and flush pending timer interrupts */
        regmap_write(regmap_st, AT91_ST_IDR, AT91_ST_PITS | AT91_ST_ALMS);
        regmap_read(regmap_st, AT91_ST_SR, &val);
-
        last_crtr = read_CRTR();
-       switch (mode) {
-       case CLOCK_EVT_MODE_PERIODIC:
-               /* PIT for periodic irqs; fixed rate of 1/HZ */
-               irqmask = AT91_ST_PITS;
-               regmap_write(regmap_st, AT91_ST_PIMR, RM9200_TIMER_LATCH);
-               break;
-       case CLOCK_EVT_MODE_ONESHOT:
-               /* ALM for oneshot irqs, set by next_event()
-                * before 32 seconds have passed
-                */
-               irqmask = AT91_ST_ALMS;
-               regmap_write(regmap_st, AT91_ST_RTAR, last_crtr);
-               break;
-       case CLOCK_EVT_MODE_SHUTDOWN:
-       case CLOCK_EVT_MODE_UNUSED:
-               remove_irq(NR_IRQS_LEGACY + AT91_ID_SYS, &at91rm9200_timer_irq);
-       case CLOCK_EVT_MODE_RESUME:
-               irqmask = 0;
-               break;
-       }
+}
+
+static int atmel_st_irq;
+
+static int clkevt32k_shutdown(struct clock_event_device *evt)
+{
+       clkdev32k_disable_and_flush_irq();
+       irqmask = 0;
+       regmap_write(regmap_st, AT91_ST_IER, irqmask);
+       free_irq(atmel_st_irq, regmap_st);
+       return 0;
+}
+
+static int clkevt32k_set_oneshot(struct clock_event_device *dev)
+{
+       int ret;
+
+       clkdev32k_disable_and_flush_irq();
+
+       ret = request_irq(atmel_st_irq, at91rm9200_timer_interrupt,
+                         IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,
+                         "at91_tick", regmap_st);
+       if (ret)
+               panic(pr_fmt("Unable to setup IRQ\n"));
+
+       /*
+        * ALM for oneshot irqs, set by next_event()
+        * before 32 seconds have passed.
+        */
+       irqmask = AT91_ST_ALMS;
+       regmap_write(regmap_st, AT91_ST_RTAR, last_crtr);
        regmap_write(regmap_st, AT91_ST_IER, irqmask);
+       return 0;
+}
+
+static int clkevt32k_set_periodic(struct clock_event_device *dev)
+{
+       int ret;
+
+       clkdev32k_disable_and_flush_irq();
+
+       ret = request_irq(atmel_st_irq, at91rm9200_timer_interrupt,
+                         IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,
+                         "at91_tick", regmap_st);
+       if (ret)
+               panic(pr_fmt("Unable to setup IRQ\n"));
+
+       /* PIT for periodic irqs; fixed rate of 1/HZ */
+       irqmask = AT91_ST_PITS;
+       regmap_write(regmap_st, AT91_ST_PIMR, timer_latch);
+       regmap_write(regmap_st, AT91_ST_IER, irqmask);
+       return 0;
 }
 
 static int
@@ -171,11 +199,15 @@ clkevt32k_next_event(unsigned long delta, struct clock_event_device *dev)
 }
 
 static struct clock_event_device clkevt = {
-       .name           = "at91_tick",
-       .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-       .rating         = 150,
-       .set_next_event = clkevt32k_next_event,
-       .set_mode       = clkevt32k_mode,
+       .name                   = "at91_tick",
+       .features               = CLOCK_EVT_FEAT_PERIODIC |
+                                 CLOCK_EVT_FEAT_ONESHOT,
+       .rating                 = 150,
+       .set_next_event         = clkevt32k_next_event,
+       .set_state_shutdown     = clkevt32k_shutdown,
+       .set_state_periodic     = clkevt32k_set_periodic,
+       .set_state_oneshot      = clkevt32k_set_oneshot,
+       .tick_resume            = clkevt32k_shutdown,
 };
 
 /*
@@ -183,8 +215,9 @@ static struct clock_event_device clkevt = {
  */
 static void __init atmel_st_timer_init(struct device_node *node)
 {
-       unsigned int val;
-       int irq, ret;
+       struct clk *sclk;
+       unsigned int sclk_rate, val;
+       int ret;
 
        regmap_st = syscon_node_to_regmap(node);
        if (IS_ERR(regmap_st))
@@ -196,16 +229,22 @@ static void __init atmel_st_timer_init(struct device_node *node)
        regmap_read(regmap_st, AT91_ST_SR, &val);
 
        /* Get the interrupts property */
-       irq  = irq_of_parse_and_map(node, 0);
-       if (!irq)
+       atmel_st_irq  = irq_of_parse_and_map(node, 0);
+       if (!atmel_st_irq)
                panic(pr_fmt("Unable to get IRQ from DT\n"));
 
-       /* Make IRQs happen for the system timer */
-       ret = request_irq(irq, at91rm9200_timer_interrupt,
-                         IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,
-                         "at91_tick", regmap_st);
+       sclk = of_clk_get(node, 0);
+       if (IS_ERR(sclk))
+               panic(pr_fmt("Unable to get slow clock\n"));
+
+       clk_prepare_enable(sclk);
        if (ret)
-               panic(pr_fmt("Unable to setup IRQ\n"));
+               panic(pr_fmt("Could not enable slow clock\n"));
+
+       sclk_rate = clk_get_rate(sclk);
+       if (!sclk_rate)
+               panic(pr_fmt("Invalid slow clock rate\n"));
+       timer_latch = (sclk_rate + HZ / 2) / HZ;
 
        /* The 32KiHz "Slow Clock" (tick every 30517.58 nanoseconds) is used
         * directly for the clocksource and all clockevents, after adjusting
@@ -215,11 +254,11 @@ static void __init atmel_st_timer_init(struct device_node *node)
 
        /* Setup timer clockevent, with minimum of two ticks (important!!) */
        clkevt.cpumask = cpumask_of(0);
-       clockevents_config_and_register(&clkevt, AT91_SLOW_CLOCK,
+       clockevents_config_and_register(&clkevt, sclk_rate,
                                        2, AT91_ST_ALMV);
 
        /* register clocksource */
-       clocksource_register_hz(&clk32k, AT91_SLOW_CLOCK);
+       clocksource_register_hz(&clk32k, sclk_rate);
 }
 CLOCKSOURCE_OF_DECLARE(atmel_st_timer, "atmel,at91rm9200-st",
                       atmel_st_timer_init);