]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
ARM: mach-shmobile: r8a7740: add INTC support
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fri, 11 Nov 2011 02:46:35 +0000 (18:46 -0800)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 11 Nov 2011 07:55:37 +0000 (16:55 +0900)
R8A7740 GIC can not get external IRQx interrupt directly
without GIC - INTC demux support.

Current AG5 is using GIC - INTCS demux with
special irq relocation. but GIC - INTCA demux
is still not supported and it needs irq number re-mapping.

OTOH, normal INTC support as before is very enough for R8A7740,
because it is not SMP CPU.
This patch adds INTCA/INTCS support instead of GIC.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/Makefile
arch/arm/mach-shmobile/intc-r8a7740.c
arch/arm/mach-shmobile/setup-r8a7740.c

index 329a3cb7f99be1a7f7e1620852cd80b3abd5ae44..aa63c968f420a0fbf786b7d5203b94018e10bc7a 100644 (file)
@@ -33,7 +33,6 @@ config ARCH_R8A7740
        select CPU_V7
        select SH_CLK_CPG
        select ARCH_WANT_OPTIONAL_GPIOLIB
-       select ARM_GIC
 
 comment "SH-Mobile Board Type"
 
index 2bd2d3ba8ffe06672ca7343e42a7c12c79e8dfdb..971f7038f05a6bcc5879a76269a80c938ef173bb 100644 (file)
@@ -31,7 +31,7 @@ obj-$(CONFIG_ARCH_SH7367)     += entry-intc.o
 obj-$(CONFIG_ARCH_SH7377)      += entry-intc.o
 obj-$(CONFIG_ARCH_SH7372)      += entry-intc.o
 obj-$(CONFIG_ARCH_SH73A0)      += entry-gic.o
-obj-$(CONFIG_ARCH_R8A7740)     += entry-gic.o
+obj-$(CONFIG_ARCH_R8A7740)     += entry-intc.o
 
 # PM objects
 obj-$(CONFIG_SUSPEND)          += suspend.o
index c62a2059f2f7a94020a003f17f3560e4e11b9ac6..272c84c20c839d5415bc9953c7b234a4f053e676 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/io.h>
-#include <asm/hardware/gic.h>
+#include <linux/sh_intc.h>
+#include <mach/intc.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
 
-#define INTA_CTRL      0xe605807c
+/*
+ *             INTCA
+ */
+enum {
+       UNUSED_INTCA = 0,
+
+       /* interrupt sources INTCA */
+       DIRC,
+       ATAPI,
+       IIC1_ALI, IIC1_TACKI, IIC1_WAITI, IIC1_DTEI,
+       AP_ARM_COMMTX, AP_ARM_COMMRX,
+       MFI, MFIS,
+       BBIF1, BBIF2,
+       USBHSDMAC,
+       USBF_OUL_SOF, USBF_IXL_INT,
+       SGX540,
+       CMT1_0, CMT1_1, CMT1_2, CMT1_3,
+       CMT2,
+       CMT3,
+       KEYSC,
+       SCIFA0, SCIFA1, SCIFA2, SCIFA3,
+       MSIOF2, MSIOF1,
+       SCIFA4, SCIFA5, SCIFB,
+       FLCTL_FLSTEI, FLCTL_FLTENDI, FLCTL_FLTREQ0I, FLCTL_FLTREQ1I,
+       SDHI0_0, SDHI0_1, SDHI0_2, SDHI0_3,
+       SDHI1_0, SDHI1_1, SDHI1_2, SDHI1_3,
+       AP_ARM_L2CINT,
+       IRDA,
+       TPU0,
+       SCIFA6, SCIFA7,
+       GbEther,
+       ICBS0,
+       DDM,
+       SDHI2_0, SDHI2_1, SDHI2_2, SDHI2_3,
+       RWDT0,
+       DMAC1_1_DEI0, DMAC1_1_DEI1, DMAC1_1_DEI2, DMAC1_1_DEI3,
+       DMAC1_2_DEI4, DMAC1_2_DEI5, DMAC1_2_DADERR,
+       DMAC2_1_DEI0, DMAC2_1_DEI1, DMAC2_1_DEI2, DMAC2_1_DEI3,
+       DMAC2_2_DEI4, DMAC2_2_DEI5, DMAC2_2_DADERR,
+       DMAC3_1_DEI0, DMAC3_1_DEI1, DMAC3_1_DEI2, DMAC3_1_DEI3,
+       DMAC3_2_DEI4, DMAC3_2_DEI5, DMAC3_2_DADERR,
+       SHWYSTAT_RT, SHWYSTAT_HS, SHWYSTAT_COM,
+       USBH_INT, USBH_OHCI, USBH_EHCI, USBH_PME, USBH_BIND,
+       RSPI_OVRF, RSPI_SPTEF, RSPI_SPRF,
+       SPU2_0, SPU2_1,
+       FSI, FMSI,
+       IPMMU,
+       AP_ARM_CTIIRQ, AP_ARM_PMURQ,
+       MFIS2,
+       CPORTR2S,
+       CMT14, CMT15,
+       MMCIF_0, MMCIF_1, MMCIF_2,
+       SIM_ERI, SIM_RXI, SIM_TXI, SIM_TEI,
+       STPRO_0, STPRO_1, STPRO_2, STPRO_3, STPRO_4,
+
+       /* interrupt groups INTCA */
+       DMAC1_1, DMAC1_2,
+       DMAC2_1, DMAC2_2,
+       DMAC3_1, DMAC3_2,
+       AP_ARM1, AP_ARM2,
+       SDHI0, SDHI1, SDHI2,
+       SHWYSTAT,
+       USBF, USBH1, USBH2,
+       RSPI, SPU2, FLCTL, IIC1,
+};
+
+static struct intc_vect intca_vectors[] __initdata = {
+       INTC_VECT(DIRC,                 0x0560),
+       INTC_VECT(ATAPI,                0x05E0),
+       INTC_VECT(IIC1_ALI,             0x0780),
+       INTC_VECT(IIC1_TACKI,           0x07A0),
+       INTC_VECT(IIC1_WAITI,           0x07C0),
+       INTC_VECT(IIC1_DTEI,            0x07E0),
+       INTC_VECT(AP_ARM_COMMTX,        0x0840),
+       INTC_VECT(AP_ARM_COMMRX,        0x0860),
+       INTC_VECT(MFI,                  0x0900),
+       INTC_VECT(MFIS,                 0x0920),
+       INTC_VECT(BBIF1,                0x0940),
+       INTC_VECT(BBIF2,                0x0960),
+       INTC_VECT(USBHSDMAC,            0x0A00),
+       INTC_VECT(USBF_OUL_SOF,         0x0A20),
+       INTC_VECT(USBF_IXL_INT,         0x0A40),
+       INTC_VECT(SGX540,               0x0A60),
+       INTC_VECT(CMT1_0,               0x0B00),
+       INTC_VECT(CMT1_1,               0x0B20),
+       INTC_VECT(CMT1_2,               0x0B40),
+       INTC_VECT(CMT1_3,               0x0B60),
+       INTC_VECT(CMT2,                 0x0B80),
+       INTC_VECT(CMT3,                 0x0BA0),
+       INTC_VECT(KEYSC,                0x0BE0),
+       INTC_VECT(SCIFA0,               0x0C00),
+       INTC_VECT(SCIFA1,               0x0C20),
+       INTC_VECT(SCIFA2,               0x0C40),
+       INTC_VECT(SCIFA3,               0x0C60),
+       INTC_VECT(MSIOF2,               0x0C80),
+       INTC_VECT(MSIOF1,               0x0D00),
+       INTC_VECT(SCIFA4,               0x0D20),
+       INTC_VECT(SCIFA5,               0x0D40),
+       INTC_VECT(SCIFB,                0x0D60),
+       INTC_VECT(FLCTL_FLSTEI,         0x0D80),
+       INTC_VECT(FLCTL_FLTENDI,        0x0DA0),
+       INTC_VECT(FLCTL_FLTREQ0I,       0x0DC0),
+       INTC_VECT(FLCTL_FLTREQ1I,       0x0DE0),
+       INTC_VECT(SDHI0_0,              0x0E00),
+       INTC_VECT(SDHI0_1,              0x0E20),
+       INTC_VECT(SDHI0_2,              0x0E40),
+       INTC_VECT(SDHI0_3,              0x0E60),
+       INTC_VECT(SDHI1_0,              0x0E80),
+       INTC_VECT(SDHI1_1,              0x0EA0),
+       INTC_VECT(SDHI1_2,              0x0EC0),
+       INTC_VECT(SDHI1_3,              0x0EE0),
+       INTC_VECT(AP_ARM_L2CINT,        0x0FA0),
+       INTC_VECT(IRDA,                 0x0480),
+       INTC_VECT(TPU0,                 0x04A0),
+       INTC_VECT(SCIFA6,               0x04C0),
+       INTC_VECT(SCIFA7,               0x04E0),
+       INTC_VECT(GbEther,              0x0500),
+       INTC_VECT(ICBS0,                0x0540),
+       INTC_VECT(DDM,                  0x1140),
+       INTC_VECT(SDHI2_0,              0x1200),
+       INTC_VECT(SDHI2_1,              0x1220),
+       INTC_VECT(SDHI2_2,              0x1240),
+       INTC_VECT(SDHI2_3,              0x1260),
+       INTC_VECT(RWDT0,                0x1280),
+       INTC_VECT(DMAC1_1_DEI0,         0x2000),
+       INTC_VECT(DMAC1_1_DEI1,         0x2020),
+       INTC_VECT(DMAC1_1_DEI2,         0x2040),
+       INTC_VECT(DMAC1_1_DEI3,         0x2060),
+       INTC_VECT(DMAC1_2_DEI4,         0x2080),
+       INTC_VECT(DMAC1_2_DEI5,         0x20A0),
+       INTC_VECT(DMAC1_2_DADERR,       0x20C0),
+       INTC_VECT(DMAC2_1_DEI0,         0x2100),
+       INTC_VECT(DMAC2_1_DEI1,         0x2120),
+       INTC_VECT(DMAC2_1_DEI2,         0x2140),
+       INTC_VECT(DMAC2_1_DEI3,         0x2160),
+       INTC_VECT(DMAC2_2_DEI4,         0x2180),
+       INTC_VECT(DMAC2_2_DEI5,         0x21A0),
+       INTC_VECT(DMAC2_2_DADERR,       0x21C0),
+       INTC_VECT(DMAC3_1_DEI0,         0x2200),
+       INTC_VECT(DMAC3_1_DEI1,         0x2220),
+       INTC_VECT(DMAC3_1_DEI2,         0x2240),
+       INTC_VECT(DMAC3_1_DEI3,         0x2260),
+       INTC_VECT(DMAC3_2_DEI4,         0x2280),
+       INTC_VECT(DMAC3_2_DEI5,         0x22A0),
+       INTC_VECT(DMAC3_2_DADERR,       0x22C0),
+       INTC_VECT(SHWYSTAT_RT,          0x1300),
+       INTC_VECT(SHWYSTAT_HS,          0x1320),
+       INTC_VECT(SHWYSTAT_COM,         0x1340),
+       INTC_VECT(USBH_INT,             0x1540),
+       INTC_VECT(USBH_OHCI,            0x1560),
+       INTC_VECT(USBH_EHCI,            0x1580),
+       INTC_VECT(USBH_PME,             0x15A0),
+       INTC_VECT(USBH_BIND,            0x15C0),
+       INTC_VECT(RSPI_OVRF,            0x1780),
+       INTC_VECT(RSPI_SPTEF,           0x17A0),
+       INTC_VECT(RSPI_SPRF,            0x17C0),
+       INTC_VECT(SPU2_0,               0x1800),
+       INTC_VECT(SPU2_1,               0x1820),
+       INTC_VECT(FSI,                  0x1840),
+       INTC_VECT(FMSI,                 0x1860),
+       INTC_VECT(IPMMU,                0x1920),
+       INTC_VECT(AP_ARM_CTIIRQ,        0x1980),
+       INTC_VECT(AP_ARM_PMURQ,         0x19A0),
+       INTC_VECT(MFIS2,                0x1A00),
+       INTC_VECT(CPORTR2S,             0x1A20),
+       INTC_VECT(CMT14,                0x1A40),
+       INTC_VECT(CMT15,                0x1A60),
+       INTC_VECT(MMCIF_0,              0x1AA0),
+       INTC_VECT(MMCIF_1,              0x1AC0),
+       INTC_VECT(MMCIF_2,              0x1AE0),
+       INTC_VECT(SIM_ERI,              0x1C00),
+       INTC_VECT(SIM_RXI,              0x1C20),
+       INTC_VECT(SIM_TXI,              0x1C40),
+       INTC_VECT(SIM_TEI,              0x1C60),
+       INTC_VECT(STPRO_0,              0x1C80),
+       INTC_VECT(STPRO_1,              0x1CA0),
+       INTC_VECT(STPRO_2,              0x1CC0),
+       INTC_VECT(STPRO_3,              0x1CE0),
+       INTC_VECT(STPRO_4,              0x1D00),
+};
+
+static struct intc_group intca_groups[] __initdata = {
+       INTC_GROUP(DMAC1_1,
+                  DMAC1_1_DEI0, DMAC1_1_DEI1, DMAC1_1_DEI2, DMAC1_1_DEI3),
+       INTC_GROUP(DMAC1_2,
+                  DMAC1_2_DEI4, DMAC1_2_DEI5, DMAC1_2_DADERR),
+       INTC_GROUP(DMAC2_1,
+                  DMAC2_1_DEI0, DMAC2_1_DEI1, DMAC2_1_DEI2, DMAC2_1_DEI3),
+       INTC_GROUP(DMAC2_2,
+                  DMAC2_2_DEI4, DMAC2_2_DEI5, DMAC2_2_DADERR),
+       INTC_GROUP(DMAC3_1,
+                  DMAC3_1_DEI0, DMAC3_1_DEI1, DMAC3_1_DEI2, DMAC3_1_DEI3),
+       INTC_GROUP(DMAC3_2,
+                  DMAC3_2_DEI4, DMAC3_2_DEI5, DMAC3_2_DADERR),
+       INTC_GROUP(AP_ARM1,
+                  AP_ARM_COMMTX, AP_ARM_COMMRX),
+       INTC_GROUP(AP_ARM2,
+                  AP_ARM_CTIIRQ, AP_ARM_PMURQ),
+       INTC_GROUP(USBF,
+                  USBF_OUL_SOF, USBF_IXL_INT),
+       INTC_GROUP(SDHI0,
+                  SDHI0_0, SDHI0_1, SDHI0_2, SDHI0_3),
+       INTC_GROUP(SDHI1,
+                  SDHI1_0, SDHI1_1, SDHI1_2, SDHI1_3),
+       INTC_GROUP(SDHI2,
+                  SDHI2_0, SDHI2_1, SDHI2_2, SDHI2_3),
+       INTC_GROUP(SHWYSTAT,
+                  SHWYSTAT_RT, SHWYSTAT_HS, SHWYSTAT_COM),
+       INTC_GROUP(USBH1, /* FIXME */
+                  USBH_INT, USBH_OHCI),
+       INTC_GROUP(USBH2, /* FIXME */
+                  USBH_EHCI,
+                  USBH_PME, USBH_BIND),
+       INTC_GROUP(RSPI,
+                  RSPI_OVRF, RSPI_SPTEF, RSPI_SPRF),
+       INTC_GROUP(SPU2,
+                  SPU2_0, SPU2_1),
+       INTC_GROUP(FLCTL,
+                  FLCTL_FLSTEI, FLCTL_FLTENDI, FLCTL_FLTREQ0I, FLCTL_FLTREQ1I),
+       INTC_GROUP(IIC1,
+                  IIC1_ALI, IIC1_TACKI, IIC1_WAITI, IIC1_DTEI),
+};
+
+static struct intc_mask_reg intca_mask_registers[] __initdata = {
+       { /* IMR0A / IMCR0A */ 0xe6940080, 0xe69400c0, 8,
+         { DMAC2_1_DEI3, DMAC2_1_DEI2, DMAC2_1_DEI1, DMAC2_1_DEI0,
+           0, 0, AP_ARM_COMMTX, AP_ARM_COMMRX } },
+       { /* IMR1A / IMCR1A */ 0xe6940084, 0xe69400c4, 8,
+         { ATAPI, 0, DIRC, 0,
+           DMAC1_1_DEI3, DMAC1_1_DEI2, DMAC1_1_DEI1, DMAC1_1_DEI0 } },
+       { /* IMR2A / IMCR2A */ 0xe6940088, 0xe69400c8, 8,
+         { 0, 0, 0, 0,
+           BBIF1, BBIF2, MFIS, MFI } },
+       { /* IMR3A / IMCR3A */ 0xe694008c, 0xe69400cc, 8,
+         { DMAC3_1_DEI3, DMAC3_1_DEI2, DMAC3_1_DEI1, DMAC3_1_DEI0,
+           DMAC3_2_DADERR, DMAC3_2_DEI5, DMAC3_2_DEI4, IRDA } },
+       { /* IMR4A / IMCR4A */ 0xe6940090, 0xe69400d0, 8,
+         { DDM, 0, 0, 0,
+           0, 0, 0, 0 } },
+       { /* IMR5A / IMCR5A */ 0xe6940094, 0xe69400d4, 8,
+         { KEYSC, DMAC1_2_DADERR, DMAC1_2_DEI5, DMAC1_2_DEI4,
+           SCIFA3, SCIFA2, SCIFA1, SCIFA0 } },
+       { /* IMR6A / IMCR6A */ 0xe6940098, 0xe69400d8, 8,
+         { SCIFB, SCIFA5, SCIFA4, MSIOF1,
+           0, 0, MSIOF2, 0 } },
+       { /* IMR7A / IMCR7A */ 0xe694009c, 0xe69400dc, 8,
+         { SDHI0_3, SDHI0_2, SDHI0_1, SDHI0_0,
+           FLCTL_FLTREQ1I, FLCTL_FLTREQ0I, FLCTL_FLTENDI, FLCTL_FLSTEI } },
+       { /* IMR8A / IMCR8A */ 0xe69400a0, 0xe69400e0, 8,
+         { SDHI1_3, SDHI1_2, SDHI1_1, SDHI1_0,
+           0, USBHSDMAC, 0, AP_ARM_L2CINT } },
+       { /* IMR9A / IMCR9A */ 0xe69400a4, 0xe69400e4, 8,
+         { CMT1_3, CMT1_2, CMT1_1, CMT1_0,
+           CMT2, USBF_IXL_INT, USBF_OUL_SOF, SGX540 } },
+       { /* IMR10A / IMCR10A */ 0xe69400a8, 0xe69400e8, 8,
+         { 0, DMAC2_2_DADERR, DMAC2_2_DEI5, DMAC2_2_DEI4,
+           0, 0, 0, 0 } },
+       { /* IMR11A / IMCR11A */ 0xe69400ac, 0xe69400ec, 8,
+         { IIC1_DTEI, IIC1_WAITI, IIC1_TACKI, IIC1_ALI,
+           ICBS0, 0, 0, 0 } },
+       { /* IMR12A / IMCR12A */ 0xe69400b0, 0xe69400f0, 8,
+         { 0, 0, TPU0, SCIFA6,
+           SCIFA7, GbEther, 0, 0 } },
+       { /* IMR13A / IMCR13A */ 0xe69400b4, 0xe69400f4, 8,
+         { SDHI2_3, SDHI2_2, SDHI2_1, SDHI2_0,
+           0, CMT3, 0, RWDT0 } },
+       { /* IMR0A3 / IMCR0A3 */ 0xe6950080, 0xe69500c0, 8,
+         { SHWYSTAT_RT, SHWYSTAT_HS, SHWYSTAT_COM, 0,
+           0, 0, 0, 0 } },
+         /* IMR1A3 / IMCR1A3 */
+       { /* IMR2A3 / IMCR2A3 */ 0xe6950088, 0xe69500c8, 8,
+         { 0, 0, USBH_INT, USBH_OHCI,
+           USBH_EHCI, USBH_PME, USBH_BIND, 0 } },
+         /* IMR3A3 / IMCR3A3 */
+       { /* IMR4A3 / IMCR4A3 */ 0xe6950090, 0xe69500d0, 8,
+         { 0, 0, 0, 0,
+           RSPI_OVRF, RSPI_SPTEF, RSPI_SPRF, 0 } },
+       { /* IMR5A3 / IMCR5A3 */ 0xe6950094, 0xe69500d4, 8,
+         { SPU2_0, SPU2_1, FSI, FMSI,
+           0, 0, 0, 0 } },
+       { /* IMR6A3 / IMCR6A3 */ 0xe6950098, 0xe69500d8, 8,
+         { 0, IPMMU, 0, 0,
+           AP_ARM_CTIIRQ, AP_ARM_PMURQ, 0, 0 } },
+       { /* IMR7A3 / IMCR7A3 */ 0xe695009c, 0xe69500dc, 8,
+         { MFIS2, CPORTR2S, CMT14, CMT15,
+           0, MMCIF_0, MMCIF_1, MMCIF_2 } },
+         /* IMR8A3 / IMCR8A3 */
+       { /* IMR9A3 / IMCR9A3 */ 0xe69500a4, 0xe69500e4, 8,
+         { SIM_ERI, SIM_RXI, SIM_TXI, SIM_TEI,
+           STPRO_0, STPRO_1, STPRO_2, STPRO_3 } },
+       { /* IMR10A3 / IMCR10A3 */ 0xe69500a8, 0xe69500e8, 8,
+         { STPRO_4, 0, 0, 0,
+           0, 0, 0, 0 } },
+};
+
+static struct intc_prio_reg intca_prio_registers[] __initdata = {
+       { 0xe6940000, 0, 16, 4, /* IPRAA */ { DMAC3_1, DMAC3_2, CMT2, ICBS0 } },
+       { 0xe6940004, 0, 16, 4, /* IPRBA */ { IRDA, 0, BBIF1, BBIF2 } },
+       { 0xe6940008, 0, 16, 4, /* IPRCA */ { ATAPI, 0, CMT1_1, AP_ARM1 } },
+       { 0xe694000c, 0, 16, 4, /* IPRDA */ { 0, 0, CMT1_2, 0 } },
+       { 0xe6940010, 0, 16, 4, /* IPREA */ { DMAC1_1, MFIS, MFI, USBF } },
+       { 0xe6940014, 0, 16, 4, /* IPRFA */ { KEYSC, DMAC1_2,
+                                             SGX540, CMT1_0 } },
+       { 0xe6940018, 0, 16, 4, /* IPRGA */ { SCIFA0, SCIFA1,
+                                             SCIFA2, SCIFA3 } },
+       { 0xe694001c, 0, 16, 4, /* IPRGH */ { MSIOF2, USBHSDMAC,
+                                             FLCTL, SDHI0 } },
+       { 0xe6940020, 0, 16, 4, /* IPRIA */ { MSIOF1, SCIFA4, 0, IIC1 } },
+       { 0xe6940024, 0, 16, 4, /* IPRJA */ { DMAC2_1, DMAC2_2,
+                                             AP_ARM_L2CINT, 0 } },
+       { 0xe6940028, 0, 16, 4, /* IPRKA */ { 0, CMT1_3, 0, SDHI1 } },
+       { 0xe694002c, 0, 16, 4, /* IPRLA */ { TPU0, SCIFA6,
+                                             SCIFA7, GbEther } },
+       { 0xe6940030, 0, 16, 4, /* IPRMA */ { 0, CMT3, 0, RWDT0 } },
+       { 0xe6940034, 0, 16, 4, /* IPRNA */ { SCIFB, SCIFA5, 0, DDM } },
+       { 0xe6940038, 0, 16, 4, /* IPROA */ { 0, 0, DIRC, SDHI2 } },
+       { 0xe6950000, 0, 16, 4, /* IPRAA3 */ { SHWYSTAT, 0, 0, 0 } },
+                               /* IPRBA3 */
+                               /* IPRCA3 */
+                               /* IPRDA3 */
+       { 0xe6950010, 0, 16, 4, /* IPREA3 */ { USBH1, 0, 0, 0 } },
+       { 0xe6950014, 0, 16, 4, /* IPRFA3 */ { USBH2, 0, 0, 0 } },
+                               /* IPRGA3 */
+                               /* IPRHA3 */
+                               /* IPRIA3 */
+       { 0xe6950024, 0, 16, 4, /* IPRJA3 */ { RSPI, 0, 0, 0 } },
+       { 0xe6950028, 0, 16, 4, /* IPRKA3 */ { SPU2, 0, FSI, FMSI } },
+                               /* IPRLA3 */
+       { 0xe6950030, 0, 16, 4, /* IPRMA3 */ { IPMMU, 0, 0, 0 } },
+       { 0xe6950034, 0, 16, 4, /* IPRNA3 */ { AP_ARM2, 0, 0, 0 } },
+       { 0xe6950038, 0, 16, 4, /* IPROA3 */ { MFIS2, CPORTR2S,
+                                              CMT14, CMT15 } },
+       { 0xe695003c, 0, 16, 4, /* IPRPA3 */ { 0, MMCIF_0, MMCIF_1, MMCIF_2 } },
+                               /* IPRQA3 */
+                               /* IPRRA3 */
+       { 0xe6950048, 0, 16, 4, /* IPRSA3 */ { SIM_ERI, SIM_RXI,
+                                              SIM_TXI, SIM_TEI } },
+       { 0xe695004c, 0, 16, 4, /* IPRTA3 */ { STPRO_0, STPRO_1,
+                                              STPRO_2, STPRO_3 } },
+       { 0xe6950050, 0, 16, 4, /* IPRUA3 */ { STPRO_4, 0, 0, 0 } },
+};
+
+static DECLARE_INTC_DESC(intca_desc, "r8a7740-intca",
+                        intca_vectors, intca_groups,
+                        intca_mask_registers, intca_prio_registers,
+                        NULL);
+
+INTC_IRQ_PINS_32(intca_irq_pins, 0xe6900000,
+                INTC_VECT, "r8a7740-intca-irq-pins");
+
+
+/*
+ *             INTCS
+ */
+enum {
+       UNUSED_INTCS = 0,
+
+       INTCS,
+
+       /* interrupt sources INTCS */
+
+       /* HUDI */
+       /* STPRO */
+       /* RTDMAC(1) */
+       VPU5HA2,
+       _2DG_TRAP, _2DG_GPM_INT, _2DG_CER_INT,
+       /* MFI */
+       /* BBIF2 */
+       VPU5F,
+       _2DG_BRK_INT,
+       /* SGX540 */
+       /* 2DDMAC */
+       /* IPMMU */
+       /* RTDMAC 2 */
+       /* KEYSC */
+       /* MSIOF */
+       IIC0_ALI, IIC0_TACKI, IIC0_WAITI, IIC0_DTEI,
+       TMU0_0, TMU0_1, TMU0_2,
+       CMT0,
+       /* CMT2 */
+       LMB,
+       CTI,
+       VOU,
+       /* RWDT0 */
+       ICB,
+       VIO6C,
+       CEU20, CEU21,
+       JPU,
+       LCDC0,
+       LCRC,
+       /* RTDMAC2(1) */
+       /* RTDMAC2(2) */
+       LCDC1,
+       /* SPU2 */
+       /* FSI */
+       /* FMSI */
+       TMU1_0, TMU1_1, TMU1_2,
+       CMT4,
+       DISP,
+       DSRV,
+       /* MFIS2 */
+       CPORTS2R,
+
+       /* interrupt groups INTCS */
+       _2DG1,
+       IIC0, TMU1,
+};
+
+static struct intc_vect intcs_vectors[] = {
+       /* HUDI */
+       /* STPRO */
+       /* RTDMAC(1) */
+       INTCS_VECT(VPU5HA2,             0x0880),
+       INTCS_VECT(_2DG_TRAP,           0x08A0),
+       INTCS_VECT(_2DG_GPM_INT,        0x08C0),
+       INTCS_VECT(_2DG_CER_INT,        0x08E0),
+       /* MFI */
+       /* BBIF2 */
+       INTCS_VECT(VPU5F,               0x0980),
+       INTCS_VECT(_2DG_BRK_INT,        0x09A0),
+       /* SGX540 */
+       /* 2DDMAC */
+       /* IPMMU */
+       /* RTDMAC(2) */
+       /* KEYSC */
+       /* MSIOF */
+       INTCS_VECT(IIC0_ALI,            0x0E00),
+       INTCS_VECT(IIC0_TACKI,          0x0E20),
+       INTCS_VECT(IIC0_WAITI,          0x0E40),
+       INTCS_VECT(IIC0_DTEI,           0x0E60),
+       INTCS_VECT(TMU0_0,              0x0E80),
+       INTCS_VECT(TMU0_1,              0x0EA0),
+       INTCS_VECT(TMU0_2,              0x0EC0),
+       INTCS_VECT(CMT0,                0x0F00),
+       /* CMT2 */
+       INTCS_VECT(LMB,                 0x0F60),
+       INTCS_VECT(CTI,                 0x0400),
+       INTCS_VECT(VOU,                 0x0420),
+       /* RWDT0 */
+       INTCS_VECT(ICB,                 0x0480),
+       INTCS_VECT(VIO6C,               0x04E0),
+       INTCS_VECT(CEU20,               0x0500),
+       INTCS_VECT(CEU21,               0x0520),
+       INTCS_VECT(JPU,                 0x0560),
+       INTCS_VECT(LCDC0,               0x0580),
+       INTCS_VECT(LCRC,                0x05A0),
+       /* RTDMAC2(1) */
+       /* RTDMAC2(2) */
+       INTCS_VECT(LCDC1,               0x1780),
+       /* SPU2 */
+       /* FSI */
+       /* FMSI */
+       INTCS_VECT(TMU1_0,              0x1900),
+       INTCS_VECT(TMU1_1,              0x1920),
+       INTCS_VECT(TMU1_2,              0x1940),
+       INTCS_VECT(CMT4,                0x1980),
+       INTCS_VECT(DISP,                0x19A0),
+       INTCS_VECT(DSRV,                0x19C0),
+       /* MFIS2 */
+       INTCS_VECT(CPORTS2R,            0x1A20),
+
+       INTC_VECT(INTCS,                0xf80),
+};
 
-static int r8a7740_set_wake(struct irq_data *data, unsigned int on)
+static struct intc_group intcs_groups[] __initdata = {
+       INTC_GROUP(_2DG1, /*FIXME*/
+                  _2DG_CER_INT, _2DG_GPM_INT, _2DG_TRAP),
+       INTC_GROUP(IIC0,
+                  IIC0_DTEI, IIC0_WAITI, IIC0_TACKI, IIC0_ALI),
+       INTC_GROUP(TMU1,
+                  TMU1_0, TMU1_1, TMU1_2),
+};
+
+static struct intc_mask_reg intcs_mask_registers[] = {
+         /* IMR0SA / IMCR0SA */ /* all 0 */
+       { /* IMR1SA / IMCR1SA */ 0xffd20184, 0xffd201c4, 8,
+         { _2DG_CER_INT, _2DG_GPM_INT, _2DG_TRAP, VPU5HA2,
+           0, 0, 0, 0 /*STPRO*/ } },
+       { /* IMR2SA / IMCR2SA */ 0xffd20188, 0xffd201c8, 8,
+         { 0/*STPRO*/, 0, CEU21, VPU5F,
+           0/*BBIF2*/, 0, 0, 0/*MFI*/ } },
+       { /* IMR3SA / IMCR3SA */ 0xffd2018c, 0xffd201cc, 8,
+         { 0, 0, 0, 0, /*2DDMAC*/
+           VIO6C, 0, 0, ICB } },
+       { /* IMR4SA / IMCR4SA */ 0xffd20190, 0xffd201d0, 8,
+         { 0, 0, VOU, CTI,
+           JPU, 0, LCRC, LCDC0 } },
+         /* IMR5SA / IMCR5SA */ /*KEYSC/RTDMAC2/RTDMAC1*/
+         /* IMR6SA / IMCR6SA */ /*MSIOF/SGX540*/
+       { /* IMR7SA / IMCR7SA */ 0xffd2019c, 0xffd201dc, 8,
+         { 0, TMU0_2, TMU0_1, TMU0_0,
+           0, 0, 0, 0 } },
+       { /* IMR8SA / IMCR8SA */ 0xffd201a0, 0xffd201e0, 8,
+         { 0, 0, 0, 0,
+           CEU20, 0, 0, 0 } },
+       { /* IMR9SA / IMCR9SA */ 0xffd201a4, 0xffd201e4, 8,
+         { 0, 0/*RWDT0*/, 0/*CMT2*/, CMT0,
+           0, 0, 0, 0 } },
+         /* IMR10SA / IMCR10SA */ /*IPMMU*/
+       { /* IMR11SA / IMCR11SA */ 0xffd201ac, 0xffd201ec, 8,
+         { IIC0_DTEI, IIC0_WAITI, IIC0_TACKI, IIC0_ALI,
+           0, _2DG_BRK_INT, LMB, 0 } },
+         /* IMR12SA / IMCR12SA */
+         /* IMR13SA / IMCR13SA */
+         /* IMR0SA3 / IMCR0SA3 */ /*RTDMAC2(1)/RTDMAC2(2)*/
+         /* IMR1SA3 / IMCR1SA3 */
+         /* IMR2SA3 / IMCR2SA3 */
+         /* IMR3SA3 / IMCR3SA3 */
+       { /* IMR4SA3 / IMCR4SA3 */ 0xffd50190, 0xffd501d0, 8,
+         { 0, 0, 0, 0,
+           LCDC1, 0, 0, 0 } },
+         /* IMR5SA3 / IMCR5SA3 */ /* SPU2/FSI/FMSI */
+       { /* IMR6SA3 / IMCR6SA3 */ 0xffd50198, 0xffd501d8, 8,
+         { TMU1_0, TMU1_1, TMU1_2, 0,
+           CMT4, DISP, DSRV, 0 } },
+       { /* IMR7SA3 / IMCR7SA3 */ 0xffd5019c, 0xffd501dc, 8,
+         { 0/*MFIS2*/, CPORTS2R, 0, 0,
+           0, 0, 0, 0 } },
+       { /* INTAMASK */ 0xffd20104, 0, 16,
+         { 0, 0, 0, 0, 0, 0, 0, 0,
+           0, 0, 0, 0, 0, 0, 0, INTCS } },
+};
+
+/* Priority is needed for INTCA to receive the INTCS interrupt */
+static struct intc_prio_reg intcs_prio_registers[] = {
+       { 0xffd20000, 0, 16, 4, /* IPRAS */ { CTI, VOU, 0/*2DDMAC*/, ICB } },
+       { 0xffd20004, 0, 16, 4, /* IPRBS */ { JPU, LCDC0, 0, LCRC } },
+                               /* IPRCS */ /*BBIF2*/
+                               /* IPRDS */
+       { 0xffd20010, 0, 16, 4, /* IPRES */ { 0/*RTDMAC(1)*/, VPU5HA2,
+                                             0/*MFI*/, VPU5F } },
+       { 0xffd20014, 0, 16, 4, /* IPRFS */ { 0/*KEYSC*/, 0/*RTDMAC(2)*/,
+                                             0/*CMT2*/, CMT0 } },
+       { 0xffd20018, 0, 16, 4, /* IPRGS */ { TMU0_0, TMU0_1,
+                                             TMU0_2, _2DG1 } },
+       { 0xffd2001c, 0, 16, 4, /* IPRHS */ { 0, 0/*STPRO*/, 0/*STPRO*/,
+                                             _2DG_BRK_INT/*FIXME*/ } },
+       { 0xffd20020, 0, 16, 4, /* IPRIS */ { 0, 0/*MSIOF*/, 0, IIC0 } },
+       { 0xffd20024, 0, 16, 4, /* IPRJS */ { CEU20, 0/*SGX540*/, 0, 0 } },
+       { 0xffd20028, 0, 16, 4, /* IPRKS */ { VIO6C, 0, LMB, 0 } },
+       { 0xffd2002c, 0, 16, 4, /* IPRLS */ { 0/*IPMMU*/, 0, CEU21, 0 } },
+                               /* IPRMS */ /*RWDT0*/
+                               /* IPRAS3 */ /*RTDMAC2(1)*/
+                               /* IPRBS3 */ /*RTDMAC2(2)*/
+                               /* IPRCS3 */
+                               /* IPRDS3 */
+                               /* IPRES3 */
+                               /* IPRFS3 */
+                               /* IPRGS3 */
+                               /* IPRHS3 */
+                               /* IPRIS3 */
+       { 0xffd50024, 0, 16, 4, /* IPRJS3 */ { LCDC1, 0, 0, 0 } },
+                               /* IPRKS3 */ /*SPU2/FSI/FMSi*/
+                               /* IPRLS3 */
+       { 0xffd50030, 0, 16, 4, /* IPRMS3 */ { TMU1, 0, 0, 0 } },
+       { 0xffd50034, 0, 16, 4, /* IPRNS3 */ { CMT4, DISP, DSRV, 0 } },
+       { 0xffd50038, 0, 16, 4, /* IPROS3 */ { 0/*MFIS2*/, CPORTS2R, 0, 0 } },
+                               /* IPRPS3 */
+};
+
+static struct resource intcs_resources[] __initdata = {
+       [0] = {
+               .start  = 0xffd20000,
+               .end    = 0xffd201ff,
+               .flags  = IORESOURCE_MEM,
+       },
+       [1] = {
+               .start  = 0xffd50000,
+               .end    = 0xffd501ff,
+               .flags  = IORESOURCE_MEM,
+       }
+};
+
+static struct intc_desc intcs_desc __initdata = {
+       .name = "r8a7740-intcs",
+       .resource = intcs_resources,
+       .num_resources = ARRAY_SIZE(intcs_resources),
+       .hw = INTC_HW_DESC(intcs_vectors, intcs_groups, intcs_mask_registers,
+                          intcs_prio_registers, NULL, NULL),
+};
+
+static void intcs_demux(unsigned int irq, struct irq_desc *desc)
 {
-       return 0; /* always allow wakeup */
+       void __iomem *reg = (void *)irq_get_handler_data(irq);
+       unsigned int evtcodeas = ioread32(reg);
+
+       generic_handle_irq(intcs_evt2irq(evtcodeas));
 }
 
 void __init r8a7740_init_irq(void)
 {
-       void __iomem *gic_dist_base = __io(0xf0001000);
-       void __iomem *gic_cpu_base = __io(0xf0000000);
+       void __iomem *intevtsa = ioremap_nocache(0xffd20100, PAGE_SIZE);
 
-       /*
-        * Change INT_SEL INTCA->GIC
-        * (on GPIO)
-        */
-       __raw_writel(__raw_readl(INTA_CTRL) & ~(1 << 1), INTA_CTRL);
+       register_intc_controller(&intca_desc);
+       register_intc_controller(&intca_irq_pins_desc);
+       register_intc_controller(&intcs_desc);
 
-       gic_init(0, 29, gic_dist_base, gic_cpu_base);
-       gic_arch_extn.irq_set_wake = r8a7740_set_wake;
+       /* demux using INTEVTSA */
+       irq_set_handler_data(evt2irq(0xf80), (void *)intevtsa);
+       irq_set_chained_handler(evt2irq(0xf80), intcs_demux);
 }
index e16860f04934c365740e799defe191f1a7102480..986dca6b3fad8f384ada7c5a115b50e55ba2301a 100644 (file)
@@ -35,7 +35,7 @@ static struct plat_sci_port scif0_platform_data = {
        .scscr          = SCSCR_RE | SCSCR_TE,
        .scbrr_algo_id  = SCBRR_ALGO_4,
        .type           = PORT_SCIFA,
-       .irqs           = SCIx_IRQ_MUXED(gic_spi(100)),
+       .irqs           = SCIx_IRQ_MUXED(evt2irq(0x0c00)),
 };
 
 static struct platform_device scif0_device = {
@@ -53,7 +53,7 @@ static struct plat_sci_port scif1_platform_data = {
        .scscr          = SCSCR_RE | SCSCR_TE,
        .scbrr_algo_id  = SCBRR_ALGO_4,
        .type           = PORT_SCIFA,
-       .irqs           = SCIx_IRQ_MUXED(gic_spi(101)),
+       .irqs           = SCIx_IRQ_MUXED(evt2irq(0x0c20)),
 };
 
 static struct platform_device scif1_device = {
@@ -71,7 +71,7 @@ static struct plat_sci_port scif2_platform_data = {
        .scscr          = SCSCR_RE | SCSCR_TE,
        .scbrr_algo_id  = SCBRR_ALGO_4,
        .type           = PORT_SCIFA,
-       .irqs           = SCIx_IRQ_MUXED(gic_spi(102)),
+       .irqs           = SCIx_IRQ_MUXED(evt2irq(0x0c40)),
 };
 
 static struct platform_device scif2_device = {
@@ -89,7 +89,7 @@ static struct plat_sci_port scif3_platform_data = {
        .scscr          = SCSCR_RE | SCSCR_TE,
        .scbrr_algo_id  = SCBRR_ALGO_4,
        .type           = PORT_SCIFA,
-       .irqs           = SCIx_IRQ_MUXED(gic_spi(103)),
+       .irqs           = SCIx_IRQ_MUXED(evt2irq(0x0c60)),
 };
 
 static struct platform_device scif3_device = {
@@ -107,7 +107,7 @@ static struct plat_sci_port scif4_platform_data = {
        .scscr          = SCSCR_RE | SCSCR_TE,
        .scbrr_algo_id  = SCBRR_ALGO_4,
        .type           = PORT_SCIFA,
-       .irqs           = SCIx_IRQ_MUXED(gic_spi(104)),
+       .irqs           = SCIx_IRQ_MUXED(evt2irq(0x0d20)),
 };
 
 static struct platform_device scif4_device = {
@@ -125,7 +125,7 @@ static struct plat_sci_port scif5_platform_data = {
        .scscr          = SCSCR_RE | SCSCR_TE,
        .scbrr_algo_id  = SCBRR_ALGO_4,
        .type           = PORT_SCIFA,
-       .irqs           = SCIx_IRQ_MUXED(gic_spi(105)),
+       .irqs           = SCIx_IRQ_MUXED(evt2irq(0x0d40)),
 };
 
 static struct platform_device scif5_device = {
@@ -143,7 +143,7 @@ static struct plat_sci_port scif6_platform_data = {
        .scscr          = SCSCR_RE | SCSCR_TE,
        .scbrr_algo_id  = SCBRR_ALGO_4,
        .type           = PORT_SCIFA,
-       .irqs           = SCIx_IRQ_MUXED(gic_spi(106)),
+       .irqs           = SCIx_IRQ_MUXED(evt2irq(0x04c0)),
 };
 
 static struct platform_device scif6_device = {
@@ -161,7 +161,7 @@ static struct plat_sci_port scif7_platform_data = {
        .scscr          = SCSCR_RE | SCSCR_TE,
        .scbrr_algo_id  = SCBRR_ALGO_4,
        .type           = PORT_SCIFA,
-       .irqs           = SCIx_IRQ_MUXED(gic_spi(107)),
+       .irqs           = SCIx_IRQ_MUXED(evt2irq(0x04e0)),
 };
 
 static struct platform_device scif7_device = {
@@ -179,7 +179,7 @@ static struct plat_sci_port scifb_platform_data = {
        .scscr          = SCSCR_RE | SCSCR_TE,
        .scbrr_algo_id  = SCBRR_ALGO_4,
        .type           = PORT_SCIFB,
-       .irqs           = SCIx_IRQ_MUXED(gic_spi(108)),
+       .irqs           = SCIx_IRQ_MUXED(evt2irq(0x0d60)),
 };
 
 static struct platform_device scifb_device = {
@@ -207,7 +207,7 @@ static struct resource cmt10_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = gic_spi(58),
+               .start  = evt2irq(0x0b00),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -244,8 +244,8 @@ static struct resource i2c0_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = gic_spi(201),
-               .end    = gic_spi(204),
+               .start  = intcs_evt2irq(0xe00),
+               .end    = intcs_evt2irq(0xe60),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -258,8 +258,8 @@ static struct resource i2c1_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = gic_spi(70),
-               .end    = gic_spi(73),
+               .start  = evt2irq(0x780), /* IIC1_ALI1 */
+               .end    = evt2irq(0x7e0), /* IIC1_DTEI1 */
                .flags  = IORESOURCE_IRQ,
        },
 };