Skip to contentSkip to conversation

irqchip: Place CONFIG_SIFIVE_PLIC into the menu

PATCH Applied Jonathan Neuschäfer 4 participants 4 messages Oct 2, 2019 – Nov 20, 2019 irqchip drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 irqchip: Place CONFIG_SIFIVE_PLIC into the menu

Somehow CONFIG_SIFIVE_PLIC ended up outside of the "IRQ chip support" menu.

Fixes 8237f8bc4f6e ("irqchip: add a SiFive PLIC driver")
---
 drivers/irqchip/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/irqchip/Kconfig +2 -2
index ccbb8973a324..97f9c001d8ff 100644
@@ -483,8 +483,6 @@ config TI_SCI_INTA_IRQCHIP
 	  If you wish to use interrupt aggregator irq resources managed by the
 	  TI System Controller, say Y here. Otherwise, say N.
 
-endmenu
-
 config SIFIVE_PLIC
 	bool "SiFive Platform-Level Interrupt Controller"
 	depends on RISCV
@@ -496,3 +494,5 @@ config SIFIVE_PLIC
 	   interrupt sources are subordinate to the PLIC.
 
 	   If you don't know what to do here, say Y.
+
+endmenu

--
2.20.1

Reviewed-by Acked-by on v1 1/1
#1 lore raw
Quoted 23 lines · On Wed, 02 Oct 2019 07:44:52 PDT (-0700), [email protected] wrote:

Somehow CONFIG_SIFIVE_PLIC ended up outside of the "IRQ chip support" menu.

Fixes 8237f8bc4f6e ("irqchip: add a SiFive PLIC driver")
---
 drivers/irqchip/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/irqchip/Kconfig +0 -2
index ccbb8973a324..97f9c001d8ff 100644
@@ -483,8 +483,6 @@ config TI_SCI_INTA_IRQCHIP
 	  If you wish to use interrupt aggregator irq resources managed by the
 	  TI System Controller, say Y here. Otherwise, say N.
 
-endmenu
-
 config SIFIVE_PLIC
 	bool "SiFive Platform-Level Interrupt Controller"
 	depends on RISCV

drivers/irqchip/Kconfig config SIFIVE_PLIC · line 498

Quoted 5 lines
drivers/irqchip/Kconfig +2 -0
@@ -496,3 +494,5 @@ config SIFIVE_PLIC
 	   interrupt sources are subordinate to the PLIC.
 
 	   If you don't know what to do here, say Y.
+
+endmenu

I'm assuming this is going through the irqchip tree.

#3 lore raw
In reply to Jonathan Neuschäfer
The following commit has been merged into the irq/core branch of tip:

The following commit has been merged into the irq/core branch of tip:

Commit-ID:     0149385537e6d36f535fcd83cfcabf83a32f0836
Gitweb:        https://git.kernel.org/tip/0149385537e6d36f535fcd83cfcabf83a32f0836
Author:        Jonathan Neuschäfer <[email protected]>
AuthorDate:    Wed, 02 Oct 2019 16:44:52 +02:00
Committer:     Marc Zyngier <[email protected]>
CommitterDate: Sun, 10 Nov 2019 18:48:35 

irqchip: Place CONFIG_SIFIVE_PLIC into the menu

Somehow CONFIG_SIFIVE_PLIC ended up outside of the "IRQ chip support" menu.

---
 drivers/irqchip/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/irqchip/Kconfig +2 -2
index bbb3234..697e6a8 100644
@@ -487,8 +487,6 @@ config TI_SCI_INTA_IRQCHIP
 	  If you wish to use interrupt aggregator irq resources managed by the
 	  TI System Controller, say Y here. Otherwise, say N.
 
-endmenu
-
 config SIFIVE_PLIC
 	bool "SiFive Platform-Level Interrupt Controller"
 	depends on RISCV
@@ -500,3 +498,5 @@ config SIFIVE_PLIC
 	   interrupt sources are subordinate to the PLIC.
 
 	   If you don't know what to do here, say Y.
+
+endmenu