Move the PLIC to drivers/irqchip

riscvarchive · May 24, 2017 · 81e5c9e · 81e5c9e
1 parent c416649
commit 81e5c9e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
@@ -129,17 +129,6 @@ config TUNE_GENERIC
 
 endchoice
 
-config PLIC
-	bool "Platform-Level Interrupt Controller"
-	default y
-	help
-	   This enables support for the PLIC chip found in standard RISC-V
-	   systems. The PLIC is the top-most interrupt controller found in
-	   the system, connected directly to the core complex. All other
-	   interrupt sources (MSI, GPIO, etc) are subordinate to the PLIC.
-
-	   If you don't know what to do here, say Y.
-
 config SBI_CONSOLE
 	tristate "SBI console support"
 	select TTY

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
@@ -301,3 +301,15 @@ config QCOM_IRQ_COMBINER
 	help
 	  Say yes here to add support for the IRQ combiner devices embedded
 	  in Qualcomm Technologies chips.
+
+config RISCV_PLIC
+        bool "Platform-Level Interrupt Controller"
+	depends on RISCV
+        default y
+        help
+	   This enables support for the PLIC chip found in standard RISC-V
+	   systems. The PLIC is the top-most interrupt controller found in
+	   the system, connected directly to the core complex. All other
+	   interrupt sources (MSI, GPIO, etc) are subordinate to the PLIC.
+
+	   If you don't know what to do here, say Y.
diff --git a/arch/riscv/kernel/plic.c → drivers/irqchip/irq-riscv-plic.c b/arch/riscv/kernel/plic.c → drivers/irqchip/irq-riscv-plic.c