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

Commit 67e38cf2 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

MIPS/IRQCHIP: Move irq_chip from arch/mips to drivers/irqchip. 



While at it, rename it because in drivers/irqchip no longer every CPU is
a MIPS.

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

arch/mips/Kconfig

+28 −32
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ config MIPS_ALCHEMY 
	select ARCH_PHYS_ADDR_T_64BIT

	select CEVT_R4K

	select CSRC_R4K

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select DMA_MAYBE_COHERENT	# Au1000,1500,1100 aren't, rest is

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_SUPPORTS_32BIT_KERNEL
@@ -86,7 +86,7 @@ config AR7 
	select DMA_NONCOHERENT

	select CEVT_R4K

	select CSRC_R4K

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select NO_EXCEPT_FILL

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_MIPS32_R1
@@ -107,7 +107,7 @@ config ATH25 
	select CEVT_R4K

	select CSRC_R4K

	select DMA_NONCOHERENT

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select IRQ_DOMAIN

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_SUPPORTS_BIG_ENDIAN
@@ -125,7 +125,7 @@ config ATH79 
	select DMA_NONCOHERENT

	select HAVE_CLK

	select CLKDEV_LOOKUP

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select MIPS_MACHINE

	select SYS_HAS_CPU_MIPS32_R2

	select SYS_HAS_EARLY_PRINTK
@@ -147,7 +147,7 @@ config BMIPS_GENERIC 
	select BCM7038_L1_IRQ

	select BCM7120_L2_IRQ

	select BRCMSTB_L2_IRQ

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select RAW_IRQ_ACCESSORS

	select DMA_NONCOHERENT

	select SYS_SUPPORTS_32BIT_KERNEL
@@ -177,7 +177,7 @@ config BCM47XX 
	select CSRC_R4K

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select SYS_HAS_CPU_MIPS32_R1

	select NO_EXCEPT_FILL

	select SYS_SUPPORTS_32BIT_KERNEL
@@ -197,7 +197,7 @@ config BCM63XX 
	select CSRC_R4K

	select SYNC_R4K

	select DMA_NONCOHERENT

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_HAS_EARLY_PRINTK
@@ -217,7 +217,7 @@ config MIPS_COBALT 
	select HW_HAS_PCI

	select I8253

	select I8259

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select IRQ_GT641XX

	select PCI_GT64XXX_PCI0

	select PCI
@@ -240,7 +240,7 @@ config MACH_DECSTATION 
	select CPU_R4400_WORKAROUNDS if 64BIT

	select DMA_NONCOHERENT

	select NO_IOPORT_MAP

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select SYS_HAS_CPU_R3000

	select SYS_HAS_CPU_R4X00

	select SYS_SUPPORTS_32BIT_KERNEL
@@ -275,7 +275,7 @@ config MACH_JAZZ 
	select DEFAULT_SGI_PARTITION if CPU_BIG_ENDIAN

	select GENERIC_ISA_DMA

	select HAVE_PCSPKR_PLATFORM

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select I8253

	select I8259

	select ISA
@@ -295,7 +295,7 @@ config MACH_INGENIC 
	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_ZBOOT_UART16550

	select DMA_NONCOHERENT

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select ARCH_REQUIRE_GPIOLIB

	select SYS_HAS_EARLY_PRINTK

	select HAVE_CLK
@@ -306,7 +306,7 @@ config MACH_INGENIC 
config LANTIQ

	bool "Lantiq based platforms"

	select DMA_NONCOHERENT

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select CEVT_R4K

	select CSRC_R4K

	select SYS_HAS_CPU_MIPS32_R1
@@ -335,7 +335,7 @@ config LASAT 
	select DMA_NONCOHERENT

	select SYS_HAS_EARLY_PRINTK

	select HW_HAS_PCI

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select PCI_GT64XXX_PCI0

	select MIPS_NILE4

	select R5000_CPU_SCACHE
@@ -375,7 +375,7 @@ config MACH_PISTACHIO 
	select COMMON_CLK

	select CSRC_R4K

	select DMA_MAYBE_COHERENT

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select LIBFDT

	select MFD_SYSCON

	select MIPS_CPU_SCACHE
@@ -403,7 +403,7 @@ config MIPS_MALTA 
	select DMA_MAYBE_COHERENT

	select GENERIC_ISA_DMA

	select HAVE_PCSPKR_PLATFORM

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select MIPS_GIC

	select HW_HAS_PCI

	select I8253
@@ -451,7 +451,7 @@ config MIPS_SEAD3 
	select CPU_MIPSR2_IRQ_VI

	select CPU_MIPSR2_IRQ_EI

	select DMA_NONCOHERENT

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select MIPS_GIC

	select LIBFDT

	select MIPS_MSC
@@ -514,7 +514,7 @@ config PMC_MSP 
	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_MIPS16

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select SERIAL_8250

	select SERIAL_8250_CONSOLE

	select USB_EHCI_BIG_ENDIAN_MMIO
@@ -531,7 +531,7 @@ config RALINK 
	select CSRC_R4K

	select BOOT_RAW

	select DMA_NONCOHERENT

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select USE_OF

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_HAS_CPU_MIPS32_R2
@@ -557,7 +557,7 @@ config SGI_IP22 
	select I8253

	select I8259

	select IP22_CPU_SCACHE

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select GENERIC_ISA_DMA_SUPPORT_BROKEN

	select SGI_HAS_I8042

	select SGI_HAS_INDYDOG
@@ -616,7 +616,7 @@ config SGI_IP28 
	select DEFAULT_SGI_PARTITION

	select DMA_NONCOHERENT

	select GENERIC_ISA_DMA_SUPPORT_BROKEN

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select HW_HAS_EISA

	select I8253

	select I8259
@@ -652,7 +652,7 @@ config SGI_IP32 
	select CSRC_R4K

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select R5000_CPU_SCACHE

	select RM7000_CPU_SCACHE

	select SYS_HAS_CPU_R5000
@@ -768,7 +768,7 @@ config SNI_RM 
	select HAVE_PCSPKR_PLATFORM

	select HW_HAS_EISA

	select HW_HAS_PCI

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select I8253

	select I8259

	select ISA
@@ -801,7 +801,7 @@ config MIKROTIK_RB532 
	select CSRC_R4K

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_LITTLE_ENDIAN
@@ -867,7 +867,7 @@ config NLM_XLR_BOARD 
	select NR_CPUS_DEFAULT_32

	select CEVT_R4K

	select CSRC_R4K

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select ZONE_DMA32 if 64BIT

	select SYNC_R4K

	select SYS_HAS_EARLY_PRINTK
@@ -894,7 +894,7 @@ config NLM_XLP_BOARD 
	select NR_CPUS_DEFAULT_32

	select CEVT_R4K

	select CSRC_R4K

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select ZONE_DMA32 if 64BIT

	select SYNC_R4K

	select SYS_HAS_EARLY_PRINTK
@@ -1143,10 +1143,6 @@ config SYS_SUPPORTS_HUGETLBFS 
config MIPS_HUGE_TLB_SUPPORT

	def_bool HUGETLB_PAGE || TRANSPARENT_HUGEPAGE



config IRQ_CPU

	bool

	select IRQ_DOMAIN



config IRQ_CPU_RM7K

	bool
@@ -1173,7 +1169,7 @@ config SOC_EMMA2RH 
	select CEVT_R4K

	select CSRC_R4K

	select DMA_NONCOHERENT

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_R5500

	select SYS_SUPPORTS_32BIT_KERNEL
@@ -1184,7 +1180,7 @@ config SOC_PNX833X 
	bool

	select CEVT_R4K

	select CSRC_R4K

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select DMA_NONCOHERENT

	select SYS_HAS_CPU_MIPS32_R2

	select SYS_SUPPORTS_32BIT_KERNEL
@@ -1588,7 +1584,7 @@ config CPU_BMIPS 
	select CPU_BMIPS5000 if SYS_HAS_CPU_BMIPS5000

	select CPU_SUPPORTS_32BIT_KERNEL

	select DMA_NONCOHERENT

	select IRQ_CPU

	select IRQ_MIPS_CPU

	select SWAP_IO_SPACE

	select WEAK_ORDERING

	select CPU_SUPPORTS_HIGHMEM

arch/mips/include/asm/irqflags.h

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static inline void arch_local_irq_restore(unsigned long flags) 
	"	.set	push						\n"

	"	.set	noreorder					\n"

	"	.set	noat						\n"

#if defined(CONFIG_IRQ_CPU)

#if defined(CONFIG_IRQ_MIPS_CPU)

	/*

	 * Slow, but doesn't suffer from a relatively unlikely race

	 * condition we're having since days 1.
@@ -90,7 +90,7 @@ static inline void __arch_local_irq_restore(unsigned long flags) 
	"	.set	push						\n"

	"	.set	noreorder					\n"

	"	.set	noat						\n"

#if defined(CONFIG_IRQ_CPU)

#if defined(CONFIG_IRQ_MIPS_CPU)

	/*

	 * Slow, but doesn't suffer from a relatively unlikely race

	 * condition we're having since days 1.

arch/mips/include/asm/mach-generic/irq.h

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#endif

#endif



#ifdef CONFIG_IRQ_CPU

#ifdef CONFIG_IRQ_MIPS_CPU



#ifndef MIPS_CPU_IRQ_BASE

#ifdef CONFIG_I8259
@@ -34,7 +34,7 @@ 
#endif

#endif



#endif /* CONFIG_IRQ_CPU */

#endif /* CONFIG_IRQ_MIPS_CPU */



#ifdef CONFIG_MIPS_GIC

#ifndef MIPS_GIC_IRQ_BASE

arch/mips/include/asm/txx9irq.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


#include <irq.h>



#ifdef CONFIG_IRQ_CPU

#ifdef CONFIG_IRQ_MIPS_CPU

#define TXX9_IRQ_BASE	(MIPS_CPU_IRQ_BASE + 8)

#else

#ifdef CONFIG_I8259

arch/mips/kernel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ obj-$(CONFIG_MIPS_VPE_APSP_API_CMP) += rtlx-cmp.o 
obj-$(CONFIG_MIPS_VPE_APSP_API_MT) += rtlx-mt.o



obj-$(CONFIG_I8259)		+= i8259.o

obj-$(CONFIG_IRQ_CPU)		+= irq_cpu.o

obj-$(CONFIG_IRQ_CPU_RM7K)	+= irq-rm7000.o

obj-$(CONFIG_MIPS_MSC)		+= irq-msc01.o

obj-$(CONFIG_IRQ_TXX9)		+= irq_txx9.o