Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

MIPS: Move GIC to drivers/irqchip/ 



Move GIC irqchip support to drivers/irqchip/ and rename the Kconfig
option from IRQ_GIC to MIPS_GIC to avoid confusion with the ARM GIC.

Signed-off-by: default avatarAndrew Bresticker <abrestic@chromium.org>
Acked-by: default avatarJason Cooper <jason@lakedaemon.net>
Reviewed-by: default avatarQais Yousef <qais.yousef@imgtec.com>
Tested-by: default avatarQais Yousef <qais.yousef@imgtec.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jeffrey Deans <jeffrey.deans@imgtec.com>
Cc: Markos Chandras <markos.chandras@imgtec.com>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Jonas Gorski <jogo@openwrt.org>
Cc: John Crispin <blogic@openwrt.org>
Cc: David Daney <ddaney.cavm@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/7812/


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

arch/mips/Kconfig

+3 −7
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ config MIPS_MALTA 
	select GENERIC_ISA_DMA

	select HAVE_PCSPKR_PLATFORM

	select IRQ_CPU

	select IRQ_GIC

	select MIPS_GIC

	select HW_HAS_PCI

	select I8253

	select I8259
@@ -362,7 +362,7 @@ config MIPS_SEAD3 
	select CPU_MIPSR2_IRQ_EI

	select DMA_NONCOHERENT

	select IRQ_CPU

	select IRQ_GIC

	select MIPS_GIC

	select LIBFDT

	select MIPS_MSC

	select SYS_HAS_CPU_MIPS32_R1
@@ -1073,10 +1073,6 @@ config IRQ_TXX9 
config IRQ_GT641XX

	bool



config IRQ_GIC

	select MIPS_CM

	bool



config PCI_GT64XXX_PCI0

	bool
@@ -1890,7 +1886,7 @@ config FORCE_MAX_ZONEORDER 


config CEVT_GIC

	bool "Use GIC global counter for clock events"

	depends on IRQ_GIC && !MIPS_SEAD3

	depends on MIPS_GIC && !MIPS_SEAD3

	help

	  Use the GIC global counter for the clock events. The R4K clock

	  event driver is always present, so if the platform ends up not

arch/mips/kernel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ obj-$(CONFIG_IRQ_CPU_RM7K) += irq-rm7000.o 
obj-$(CONFIG_MIPS_MSC)		+= irq-msc01.o

obj-$(CONFIG_IRQ_TXX9)		+= irq_txx9.o

obj-$(CONFIG_IRQ_GT641XX)	+= irq-gt641xx.o

obj-$(CONFIG_IRQ_GIC)		+= irq-gic.o



obj-$(CONFIG_KPROBES)		+= kprobes.o

obj-$(CONFIG_32BIT)		+= scall32-o32.o

arch/mips/kernel/cevt-r4k.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ void mips_event_handler(struct clock_event_device *dev) 
 */

static int c0_compare_int_pending(void)

{

#ifdef CONFIG_IRQ_GIC

#ifdef CONFIG_MIPS_GIC

	if (cpu_has_veic)

		return gic_get_timer_pending();

#endif

arch/mips/kernel/smp-mt.c

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static void vsmp_send_ipi_single(int cpu, unsigned int action) 
	unsigned long flags;

	int vpflags;



#ifdef CONFIG_IRQ_GIC

#ifdef CONFIG_MIPS_GIC

	if (gic_present) {

		gic_send_ipi_single(cpu, action);

		return;
@@ -158,7 +158,7 @@ static void vsmp_send_ipi_mask(const struct cpumask *mask, unsigned int action) 


static void vsmp_init_secondary(void)

{

#ifdef CONFIG_IRQ_GIC

#ifdef CONFIG_MIPS_GIC

	/* This is Malta specific: IPI,performance and timer interrupts */

	if (gic_present)

		change_c0_status(ST0_IM, STATUSF_IP3 | STATUSF_IP4 |

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

+5 −5
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static void __init estimate_frequencies(void) 
{

	unsigned long flags;

	unsigned int count, start;

#ifdef CONFIG_IRQ_GIC

#ifdef CONFIG_MIPS_GIC

	unsigned int giccount = 0, gicstart = 0;

#endif
@@ -87,7 +87,7 @@ static void __init estimate_frequencies(void) 


	/* Initialize counters. */

	start = read_c0_count();

#ifdef CONFIG_IRQ_GIC

#ifdef CONFIG_MIPS_GIC

	if (gic_present)

		GICREAD(GIC_REG(SHARED, GIC_SH_COUNTER_31_00), gicstart);

#endif
@@ -97,7 +97,7 @@ static void __init estimate_frequencies(void) 
	while (!(CMOS_READ(RTC_REG_A) & RTC_UIP));



	count = read_c0_count();

#ifdef CONFIG_IRQ_GIC

#ifdef CONFIG_MIPS_GIC

	if (gic_present)

		GICREAD(GIC_REG(SHARED, GIC_SH_COUNTER_31_00), giccount);

#endif
@@ -107,7 +107,7 @@ static void __init estimate_frequencies(void) 
	count -= start;

	mips_hpt_frequency = count;



#ifdef CONFIG_IRQ_GIC

#ifdef CONFIG_MIPS_GIC

	if (gic_present) {

		giccount -= gicstart;

		gic_frequency = giccount;
@@ -189,7 +189,7 @@ void __init plat_time_init(void) 
	setup_pit_timer();

#endif



#ifdef CONFIG_IRQ_GIC

#ifdef CONFIG_MIPS_GIC

	if (gic_present) {

		freq = freqround(gic_frequency, 5000);

		printk("GIC frequency %d.%02d MHz\n", freq/1000000,