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

Commit 863cb9ba authored by Ralf Baechle's avatar Ralf Baechle
Browse files

MIPS: GIC: Remove dependencies from Malta files. 



This prevents the GIC code from being reusable sanely.

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

arch/mips/include/asm/gic.h

+1 −0
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ struct gic_intrmask_regs { 
 */

struct gic_intr_map {

	unsigned int cpunum;	/* Directed to this CPU */

#define GIC_UNUSED		0xdead			/* Dummy data */

	unsigned int pin;	/* Directed to this Pin */

	unsigned int polarity;	/* Polarity : +/-	*/

	unsigned int trigtype;	/* Trigger  : Edge/Levl */

arch/mips/include/asm/mips-boards/maltaint.h

+0 −3
Original line number Diff line number Diff line
@@ -88,9 +88,6 @@ 


#define GIC_EXT_INTR(x)		x



/* Dummy data */

#define X			0xdead



/* External Interrupts used for IPI */

#define GIC_IPI_EXT_INTR_RESCHED_VPE0	16

#define GIC_IPI_EXT_INTR_CALLFNC_VPE0	17

arch/mips/kernel/irq-gic.c

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

#include <asm/gic.h>

#include <asm/gcmpregs.h>

#include <asm/mips-boards/maltaint.h>

#include <asm/irq.h>

#include <linux/hardirq.h>

#include <asm-generic/bitops/find.h>
@@ -222,7 +221,7 @@ static void __init gic_basic_init(int numintrs, int numvpes, 
	/* Setup specifics */

	for (i = 0; i < mapsize; i++) {

		cpu = intrmap[i].cpunum;

		if (cpu == X)

		if (cpu == GIC_UNUSED)

			continue;

		if (cpu == 0 && i != 0 && intrmap[i].flags == 0)

			continue;

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

+3 −0
Original line number Diff line number Diff line
@@ -385,6 +385,8 @@ static int __initdata msc_nr_eicirqs = ARRAY_SIZE(msc_eicirqmap); 
 */



#define GIC_CPU_NMI GIC_MAP_TO_NMI_MSK

#define X GIC_UNUSED



static struct gic_intr_map gic_intr_map[GIC_NUM_INTRS] = {

	{ X, X,		   X,		X,		0 },

	{ X, X,		   X,	 	X,		0 },
@@ -404,6 +406,7 @@ static struct gic_intr_map gic_intr_map[GIC_NUM_INTRS] = { 
	{ X, X,		   X,		X,	        0 },

	/* The remainder of this table is initialised by fill_ipi_map */

};

#undef X



/*

 * GCMP needs to be detected before any SMP initialisation