diff options
| author | Andrew Bresticker <[email protected]> | 2014-10-20 12:04:01 -0700 |
|---|---|---|
| committer | Ralf Baechle <[email protected]> | 2014-11-24 07:45:15 +0100 |
| commit | b0854514537e4e2f0a599ca05d18fe95dcd3ee42 (patch) | |
| tree | c13664df9b06e8cd14c1b441d92375c516541621 /drivers | |
| parent | 5fee56e0ddac14511a4dd33f1240a0f0b94a9d08 (diff) | |
clocksource: mips-gic: Move gic_frequency to clocksource driver
There's no reason for gic_frequency to be global any more and it
certainly doesn't belong in the GIC irqchip driver, so move it to
the GIC clocksource driver.
Signed-off-by: Andrew Bresticker <[email protected]>
Cc: Daniel Lezcano <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Jason Cooper <[email protected]>
Cc: Paul Burton <[email protected]>
Cc: Qais Yousef <[email protected]>
Cc: John Crispin <[email protected]>
Cc: [email protected]
Cc: [email protected]
Patchwork: https://patchwork.linux-mips.org/patch/8137/
Signed-off-by: Ralf Baechle <[email protected]>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clocksource/mips-gic-timer.c | 3 | ||||
| -rw-r--r-- | drivers/irqchip/irq-mips-gic.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c index 2603f50e5706..bced17d2d2c1 100644 --- a/drivers/clocksource/mips-gic-timer.c +++ b/drivers/clocksource/mips-gic-timer.c @@ -17,6 +17,7 @@ static DEFINE_PER_CPU(struct clock_event_device, gic_clockevent_device); static int gic_timer_irq_installed; +static unsigned int gic_frequency; static int gic_next_event(unsigned long delta, struct clock_event_device *evt) { @@ -112,6 +113,8 @@ static struct clocksource gic_clocksource = { void __init gic_clocksource_init(unsigned int frequency) { + gic_frequency = frequency; + /* Set clocksource mask. */ gic_clocksource.mask = CLOCKSOURCE_MASK(gic_get_count_width()); diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c index cb674696810d..7ec3c18f1330 100644 --- a/drivers/irqchip/irq-mips-gic.c +++ b/drivers/irqchip/irq-mips-gic.c @@ -18,7 +18,6 @@ #include <asm/setup.h> #include <asm/traps.h> -unsigned int gic_frequency; unsigned int gic_present; struct gic_pcpu_mask { |