Commit b0854514 authored by Andrew Bresticker's avatar Andrew Bresticker Committed by Ralf Baechle
Browse files

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: default avatarAndrew Bresticker <abrestic@chromium.org>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Qais Yousef <qais.yousef@imgtec.com>
Cc: John Crispin <blogic@openwrt.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/8137/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 5fee56e0

arch/mips/mti-malta/malta-time.c

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ static int mips_cpu_timer_irq; 
static int mips_cpu_perf_irq;

extern int cp0_perfcount_irq;



static unsigned int gic_frequency;



static void mips_timer_dispatch(void)

{

	do_IRQ(mips_cpu_timer_irq);

drivers/clocksource/mips-gic-timer.c

+3 −0
Original line number Diff line number Diff line
@@ -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());

drivers/irqchip/irq-mips-gic.c

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <asm/setup.h>

#include <asm/traps.h>



unsigned int gic_frequency;

unsigned int gic_present;



struct gic_pcpu_mask {

include/linux/irqchip/mips-gic.h

+0 −1
Original line number Diff line number Diff line
@@ -230,7 +230,6 @@ 
#define GIC_HWIRQ_TO_SHARED(x)	((x) - GIC_SHARED_HWIRQ_BASE)



extern unsigned int gic_present;

extern unsigned int gic_frequency;



extern void gic_init(unsigned long gic_base_addr,

	unsigned long gic_addrspace_size, unsigned int cpu_vec,

CRA Git | Maintained and supported by SUSTech CRA and CCSE