These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / mips / kernel / cevt-txx9.c

diff --git a/kernel/arch/mips/kernel/cevt-txx9.c b/kernel/arch/mips/kernel/cevt-txx9.c
index 7239324..537eefd 100644 (file)
--- a/kernel/arch/mips/kernel/cevt-txx9.c
+++ b/kernel/arch/mips/kernel/cevt-txx9.c
@@ -85,36 +85,54 @@ static void txx9tmr_stop_and_clear(struct txx9_tmr_reg __iomem *tmrptr)
        __raw_writel(0, &tmrptr->tisr);
 }
 
-static void txx9tmr_set_mode(enum clock_event_mode mode,
-                            struct clock_event_device *evt)
+static int txx9tmr_set_state_periodic(struct clock_event_device *evt)
 {
        struct txx9_clock_event_device *txx9_cd =
                container_of(evt, struct txx9_clock_event_device, cd);
        struct txx9_tmr_reg __iomem *tmrptr = txx9_cd->tmrptr;
 
        txx9tmr_stop_and_clear(tmrptr);
-       switch (mode) {
-       case CLOCK_EVT_MODE_PERIODIC:
-               __raw_writel(TXx9_TMITMR_TIIE | TXx9_TMITMR_TZCE,
-                            &tmrptr->itmr);
-               /* start timer */
-               __raw_writel(((u64)(NSEC_PER_SEC / HZ) * evt->mult) >>
-                            evt->shift,
-                            &tmrptr->cpra);
-               __raw_writel(TCR_BASE | TXx9_TMTCR_TCE, &tmrptr->tcr);
-               break;
-       case CLOCK_EVT_MODE_SHUTDOWN:
-       case CLOCK_EVT_MODE_UNUSED:
-               __raw_writel(0, &tmrptr->itmr);
-               break;
-       case CLOCK_EVT_MODE_ONESHOT:
-               __raw_writel(TXx9_TMITMR_TIIE, &tmrptr->itmr);
-               break;
-       case CLOCK_EVT_MODE_RESUME:
-               __raw_writel(TIMER_CCD, &tmrptr->ccdr);
-               __raw_writel(0, &tmrptr->itmr);
-               break;
-       }
+
+       __raw_writel(TXx9_TMITMR_TIIE | TXx9_TMITMR_TZCE, &tmrptr->itmr);
+       /* start timer */
+       __raw_writel(((u64)(NSEC_PER_SEC / HZ) * evt->mult) >> evt->shift,
+                    &tmrptr->cpra);
+       __raw_writel(TCR_BASE | TXx9_TMTCR_TCE, &tmrptr->tcr);
+       return 0;
+}
+
+static int txx9tmr_set_state_oneshot(struct clock_event_device *evt)
+{
+       struct txx9_clock_event_device *txx9_cd =
+               container_of(evt, struct txx9_clock_event_device, cd);
+       struct txx9_tmr_reg __iomem *tmrptr = txx9_cd->tmrptr;
+
+       txx9tmr_stop_and_clear(tmrptr);
+       __raw_writel(TXx9_TMITMR_TIIE, &tmrptr->itmr);
+       return 0;
+}
+
+static int txx9tmr_set_state_shutdown(struct clock_event_device *evt)
+{
+       struct txx9_clock_event_device *txx9_cd =
+               container_of(evt, struct txx9_clock_event_device, cd);
+       struct txx9_tmr_reg __iomem *tmrptr = txx9_cd->tmrptr;
+
+       txx9tmr_stop_and_clear(tmrptr);
+       __raw_writel(0, &tmrptr->itmr);
+       return 0;
+}
+
+static int txx9tmr_tick_resume(struct clock_event_device *evt)
+{
+       struct txx9_clock_event_device *txx9_cd =
+               container_of(evt, struct txx9_clock_event_device, cd);
+       struct txx9_tmr_reg __iomem *tmrptr = txx9_cd->tmrptr;
+
+       txx9tmr_stop_and_clear(tmrptr);
+       __raw_writel(TIMER_CCD, &tmrptr->ccdr);
+       __raw_writel(0, &tmrptr->itmr);
+       return 0;
 }
 
 static int txx9tmr_set_next_event(unsigned long delta,
@@ -133,12 +151,15 @@ static int txx9tmr_set_next_event(unsigned long delta,
 
 static struct txx9_clock_event_device txx9_clock_event_device = {
        .cd = {
-               .name           = "TXx9",
-               .features       = CLOCK_EVT_FEAT_PERIODIC |
-                                 CLOCK_EVT_FEAT_ONESHOT,
-               .rating         = 200,
-               .set_mode       = txx9tmr_set_mode,
-               .set_next_event = txx9tmr_set_next_event,
+               .name                   = "TXx9",
+               .features               = CLOCK_EVT_FEAT_PERIODIC |
+                                         CLOCK_EVT_FEAT_ONESHOT,
+               .rating                 = 200,
+               .set_state_shutdown     = txx9tmr_set_state_shutdown,
+               .set_state_periodic     = txx9tmr_set_state_periodic,
+               .set_state_oneshot      = txx9tmr_set_state_oneshot,
+               .tick_resume            = txx9tmr_tick_resume,
+               .set_next_event         = txx9tmr_set_next_event,
        },
 };