ARM: mach-shmobile: sh7372 INTCA support

Add support for the sh7372 INTCA hardware block.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

arch/arm/mach-shmobile/Makefile

@@ -8,7 +8,7 @@ obj-y				:= timer.o console.o
 # CPU objects
 obj-$(CONFIG_ARCH_SH7367)	+= setup-sh7367.o clock-sh7367.o intc-sh7367.o
 obj-$(CONFIG_ARCH_SH7377)	+= setup-sh7377.o clock-sh7367.o intc-sh7377.o
-obj-$(CONFIG_ARCH_SH7372)	+= setup-sh7372.o clock-sh7367.o
+obj-$(CONFIG_ARCH_SH7372)	+= setup-sh7372.o clock-sh7367.o intc-sh7372.o
 
 # Board objects
 obj-$(CONFIG_MACH_G3EVM)	+= board-g3evm.o

arch/arm/mach-shmobile/setup-sh7372.c

@@ -197,45 +197,3 @@ void __init sh7372_add_early_devices(void)
 	early_platform_add_devices(sh7372_early_devices,
 				   ARRAY_SIZE(sh7372_early_devices));
 }
-
-enum {
-	UNUSED = 0,
-
-	/* interrupt sources INTCA */
-
-	SCIFA0, SCIFA1, SCIFA2, SCIFA3, SCIFA4, SCIFA5, SCIFB,
-	CMT10,
-};
-
-static struct intc_vect vectors[] = {
-	INTC_VECT(CMT10, 0xb00),
-	INTC_VECT(SCIFA0, 0xc00), INTC_VECT(SCIFA1, 0xc20),
-	INTC_VECT(SCIFA2, 0xc40), INTC_VECT(SCIFA3, 0xc60),
-	INTC_VECT(SCIFA4, 0xd20), INTC_VECT(SCIFA5, 0xd40),
-	INTC_VECT(SCIFB, 0xd60),
-};
-
-static struct intc_mask_reg mask_registers[] = {
-	{ 0xe6940094, 0xe69400d4, 8, /* IMR5A / IMCR5A */
-	  { 0, 0, 0, 0, SCIFA3, SCIFA2, SCIFA1, SCIFA0 } },
-	{ 0xe6940098, 0xe69400d8, 8, /* IMR6A / IMCR6A */
-	  { SCIFB, SCIFA5, SCIFA4, 0, 0, 0, 0, 0 } },
-	{ 0xe69400a4, 0xe69400e4, 8, /* IMR9A / IMCR9A */
-	  { 0, 0, 0, CMT10, 0, 0, 0, 0 } },
-};
-
-static struct intc_prio_reg prio_registers[] = {
-	{ 0xe6940014, 0, 16, 4, /* IPRFA */ { 0, 0, 0, CMT10 } },
-	{ 0xe6940018, 0, 16, 4, /* IPRGA */ { SCIFA0, SCIFA1,
-					      SCIFA2, SCIFA3 } },
-	{ 0xe6940020, 0, 16, 4, /* IPRIA */ { 0, SCIFA4, 0, 0 } },
-	{ 0xe6940034, 0, 16, 4, /* IPRNA */ { SCIFB, SCIFA5, 0, 0 } },
-};
-
-static DECLARE_INTC_DESC(intc_desc, "sh7372", vectors, NULL, mask_registers,
-			 prio_registers, NULL);
-
-void __init sh7372_init_irq(void)
-{
-	register_intc_controller(&intc_desc);
-}