ARM: mach-shmobile: Use INTC_IRQ_PINS_16H on sh7372

PATCH In review Magnus Damm 1 participant 2 messages Mar 28, 2012

Subsystems (4)

Arm (32-bit) Arm sub-architectures SuperH Arm/RISC-V/Renesas architecture

lore

Share & tools

lore

Magnus Damm

author maintainer

2012-03-28 06:40 UTC #0 lore raw

PATCH 5/6 ARM: mach-shmobile: Use INTC_IRQ_PINS_16H on sh7372

From: Magnus Damm <[email protected]>

Use INTC_IRQ_PINS_16H on sh7372 to have two separate interrupt controllers for the external IRQ pins.

This is preparation work for future IRQ domain support.

Signed-off-by Magnus Damm <[email protected]>

---

 arch/arm/mach-shmobile/intc-sh7372.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

arch/arm/mach-shmobile/intc-sh7372.c +8 -3

@@ -304,8 +304,12 @@ static DECLARE_INTC_DESC(intca_desc, "sh
 			 intca_mask_registers, intca_prio_registers,
 			 NULL);
 
-INTC_IRQ_PINS_32(intca_irq_pins, 0xe6900000,
-		 INTC_VECT, "sh7372-intca-irq-pins");
+INTC_IRQ_PINS_16(intca_irq_pins_lo, 0xe6900000,
+		 INTC_VECT, "sh7372-intca-irq-lo");
+
+INTC_IRQ_PINS_16H(intca_irq_pins_hi, 0xe6900000,
+		 INTC_VECT, "sh7372-intca-irq-hi");
+
 enum {
 	UNUSED_INTCS = 0,
 	ENABLED_INTCS,

@@ -562,7 +566,8 @@ void __init sh7372_init_irq(void)
 	intcs_ffd5 = ioremap_nocache(0xffd50000, PAGE_SIZE);
 
 	register_intc_controller(&intca_desc);
-	register_intc_controller(&intca_irq_pins_desc);
+	register_intc_controller(&intca_irq_pins_lo_desc);
+	register_intc_controller(&intca_irq_pins_hi_desc);
 	register_intc_controller(&intcs_desc);
 
 	/* demux using INTEVTSA */