Merge tag 'linux-kselftest-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / clocksource / mips-gic-timer.c

diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c
index c4352f0..02a1945 100644 (file)
--- a/drivers/clocksource/mips-gic-timer.c
+++ b/drivers/clocksource/mips-gic-timer.c
@@ -33,12 +33,6 @@ static int gic_next_event(unsigned long delta, struct clock_event_device *evt)
        return res;
 }
 
-static void gic_set_clock_mode(enum clock_event_mode mode,
-                               struct clock_event_device *evt)
-{
-       /* Nothing to do ...  */
-}
-
 static irqreturn_t gic_compare_interrupt(int irq, void *dev_id)
 {
        struct clock_event_device *cd = dev_id;
@@ -67,7 +61,6 @@ static void gic_clockevent_cpu_init(struct clock_event_device *cd)
        cd->irq                 = gic_timer_irq;
        cd->cpumask             = cpumask_of(cpu);
        cd->set_next_event      = gic_next_event;
-       cd->set_mode            = gic_set_clock_mode;
 
        clockevents_config_and_register(cd, gic_frequency, 0x300, 0x7fffffff);
 
@@ -79,6 +72,13 @@ static void gic_clockevent_cpu_exit(struct clock_event_device *cd)
        disable_percpu_irq(gic_timer_irq);
 }
 
+static void gic_update_frequency(void *data)
+{
+       unsigned long rate = (unsigned long)data;
+
+       clockevents_update_freq(this_cpu_ptr(&gic_clockevent_device), rate);
+}
+
 static int gic_cpu_notifier(struct notifier_block *nb, unsigned long action,
                                void *data)
 {
@@ -94,10 +94,26 @@ static int gic_cpu_notifier(struct notifier_block *nb, unsigned long action,
        return NOTIFY_OK;
 }
 
+static int gic_clk_notifier(struct notifier_block *nb, unsigned long action,
+                           void *data)
+{
+       struct clk_notifier_data *cnd = data;
+
+       if (action == POST_RATE_CHANGE)
+               on_each_cpu(gic_update_frequency, (void *)cnd->new_rate, 1);
+
+       return NOTIFY_OK;
+}
+
+
 static struct notifier_block gic_cpu_nb = {
        .notifier_call = gic_cpu_notifier,
 };
 
+static struct notifier_block gic_clk_nb = {
+       .notifier_call = gic_clk_notifier,
+};
+
 static int gic_clockevent_init(void)
 {
        int ret;
@@ -142,11 +158,6 @@ static void __init __gic_clocksource_init(void)
        ret = clocksource_register_hz(&gic_clocksource, gic_frequency);
        if (ret < 0)
                pr_warn("GIC: Unable to register clocksource\n");
-
-       gic_clockevent_init();
-
-       /* And finally start the counter */
-       gic_start_count();
 }
 
 void __init gic_clocksource_init(unsigned int frequency)
@@ -156,11 +167,16 @@ void __init gic_clocksource_init(unsigned int frequency)
                GIC_LOCAL_TO_HWIRQ(GIC_LOCAL_INT_COMPARE);
 
        __gic_clocksource_init();
+       gic_clockevent_init();
+
+       /* And finally start the counter */
+       gic_start_count();
 }
 
 static void __init gic_clocksource_of_init(struct device_node *node)
 {
        struct clk *clk;
+       int ret;
 
        if (WARN_ON(!gic_present || !node->parent ||
                    !of_device_is_compatible(node->parent, "mti,gic")))
@@ -187,6 +203,15 @@ static void __init gic_clocksource_of_init(struct device_node *node)
        }
 
        __gic_clocksource_init();
+
+       ret = gic_clockevent_init();
+       if (!ret && !IS_ERR(clk)) {
+               if (clk_notifier_register(clk, &gic_clk_nb) < 0)
+                       pr_warn("GIC: Unable to register clock notifier\n");
+       }
+
+       /* And finally start the counter */
+       gic_start_count();
 }
 CLOCKSOURCE_OF_DECLARE(mips_gic_timer, "mti,gic-timer",
                       gic_clocksource_of_init);