Merge tag 'kconfig-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[sfrench/cifs-2.6.git] / arch / arm / mach-davinci / dm644x.c

diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 38f92b7d413ef65e7d48a300760e04ae83b283b3..cecc7ceb8d34a67259dd9f4ef7d64953a2efec60 100644 (file)
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -14,6 +14,7 @@
 #include <linux/clkdev.h>
 #include <linux/dmaengine.h>
 #include <linux/init.h>
+#include <linux/irqchip/irq-davinci-aintc.h>
 #include <linux/platform_data/edma.h>
 #include <linux/platform_data/gpio-davinci.h>
 #include <linux/platform_device.h>
@@ -23,13 +24,13 @@
 
 #include <mach/common.h>
 #include <mach/cputype.h>
-#include <mach/irqs.h>
 #include <mach/mux.h>
 #include <mach/serial.h>
 #include <mach/time.h>
 
 #include "asp.h"
 #include "davinci.h"
+#include "irqs.h"
 #include "mux.h"
 
 /*
@@ -59,8 +60,8 @@ static struct resource dm644x_emac_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        {
-               .start = IRQ_EMACINT,
-               .end   = IRQ_EMACINT,
+               .start = DAVINCI_INTC_IRQ(IRQ_EMACINT),
+               .end   = DAVINCI_INTC_IRQ(IRQ_EMACINT),
                .flags = IORESOURCE_IRQ,
        },
 };
@@ -260,12 +261,12 @@ static struct resource edma_resources[] = {
        },
        {
                .name   = "edma3_ccint",
-               .start  = IRQ_CCINT0,
+               .start  = DAVINCI_INTC_IRQ(IRQ_CCINT0),
                .flags  = IORESOURCE_IRQ,
        },
        {
                .name   = "edma3_ccerrint",
-               .start  = IRQ_CCERRINT,
+               .start  = DAVINCI_INTC_IRQ(IRQ_CCERRINT),
                .flags  = IORESOURCE_IRQ,
        },
        /* not using TC*_ERR */
@@ -330,13 +331,13 @@ static struct platform_device dm644x_vpss_device = {
 
 static struct resource dm644x_vpfe_resources[] = {
        {
-               .start          = IRQ_VDINT0,
-               .end            = IRQ_VDINT0,
+               .start          = DAVINCI_INTC_IRQ(IRQ_VDINT0),
+               .end            = DAVINCI_INTC_IRQ(IRQ_VDINT0),
                .flags          = IORESOURCE_IRQ,
        },
        {
-               .start          = IRQ_VDINT1,
-               .end            = IRQ_VDINT1,
+               .start          = DAVINCI_INTC_IRQ(IRQ_VDINT1),
+               .end            = DAVINCI_INTC_IRQ(IRQ_VDINT1),
                .flags          = IORESOURCE_IRQ,
        },
 };
@@ -442,8 +443,8 @@ static int dm644x_venc_setup_clock(enum vpbe_enc_timings_type type,
 
 static struct resource dm644x_v4l2_disp_resources[] = {
        {
-               .start  = IRQ_VENCINT,
-               .end    = IRQ_VENCINT,
+               .start  = DAVINCI_INTC_IRQ(IRQ_VENCINT),
+               .end    = DAVINCI_INTC_IRQ(IRQ_VENCINT),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -491,28 +492,28 @@ static struct resource dm644_gpio_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        {       /* interrupt */
-               .start  = IRQ_GPIOBNK0,
-               .end    = IRQ_GPIOBNK0,
+               .start  = DAVINCI_INTC_IRQ(IRQ_GPIOBNK0),
+               .end    = DAVINCI_INTC_IRQ(IRQ_GPIOBNK0),
                .flags  = IORESOURCE_IRQ,
        },
        {
-               .start  = IRQ_GPIOBNK1,
-               .end    = IRQ_GPIOBNK1,
+               .start  = DAVINCI_INTC_IRQ(IRQ_GPIOBNK1),
+               .end    = DAVINCI_INTC_IRQ(IRQ_GPIOBNK1),
                .flags  = IORESOURCE_IRQ,
        },
        {
-               .start  = IRQ_GPIOBNK2,
-               .end    = IRQ_GPIOBNK2,
+               .start  = DAVINCI_INTC_IRQ(IRQ_GPIOBNK2),
+               .end    = DAVINCI_INTC_IRQ(IRQ_GPIOBNK2),
                .flags  = IORESOURCE_IRQ,
        },
        {
-               .start  = IRQ_GPIOBNK3,
-               .end    = IRQ_GPIOBNK3,
+               .start  = DAVINCI_INTC_IRQ(IRQ_GPIOBNK3),
+               .end    = DAVINCI_INTC_IRQ(IRQ_GPIOBNK3),
                .flags  = IORESOURCE_IRQ,
        },
        {
-               .start  = IRQ_GPIOBNK4,
-               .end    = IRQ_GPIOBNK4,
+               .start  = DAVINCI_INTC_IRQ(IRQ_GPIOBNK4),
+               .end    = DAVINCI_INTC_IRQ(IRQ_GPIOBNK4),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -573,7 +574,7 @@ static struct davinci_timer_info dm644x_timer_info = {
 static struct plat_serial8250_port dm644x_serial0_platform_data[] = {
        {
                .mapbase        = DAVINCI_UART0_BASE,
-               .irq            = IRQ_UARTINT0,
+               .irq            = DAVINCI_INTC_IRQ(IRQ_UARTINT0),
                .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |
                                  UPF_IOREMAP,
                .iotype         = UPIO_MEM,
@@ -586,7 +587,7 @@ static struct plat_serial8250_port dm644x_serial0_platform_data[] = {
 static struct plat_serial8250_port dm644x_serial1_platform_data[] = {
        {
                .mapbase        = DAVINCI_UART1_BASE,
-               .irq            = IRQ_UARTINT1,
+               .irq            = DAVINCI_INTC_IRQ(IRQ_UARTINT1),
                .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |
                                  UPF_IOREMAP,
                .iotype         = UPIO_MEM,
@@ -599,7 +600,7 @@ static struct plat_serial8250_port dm644x_serial1_platform_data[] = {
 static struct plat_serial8250_port dm644x_serial2_platform_data[] = {
        {
                .mapbase        = DAVINCI_UART2_BASE,
-               .irq            = IRQ_UARTINT2,
+               .irq            = DAVINCI_INTC_IRQ(IRQ_UARTINT2),
                .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |
                                  UPF_IOREMAP,
                .iotype         = UPIO_MEM,
@@ -645,10 +646,6 @@ static const struct davinci_soc_info davinci_soc_info_dm644x = {
        .pinmux_base            = DAVINCI_SYSTEM_MODULE_BASE,
        .pinmux_pins            = dm644x_pins,
        .pinmux_pins_num        = ARRAY_SIZE(dm644x_pins),
-       .intc_base              = DAVINCI_ARM_INTC_BASE,
-       .intc_type              = DAVINCI_INTC_TYPE_AINTC,
-       .intc_irq_prios         = dm644x_default_priorities,
-       .intc_irq_num           = DAVINCI_N_AINTC_IRQ,
        .timer_info             = &dm644x_timer_info,
        .emac_pdata             = &dm644x_emac_pdata,
        .sram_dma               = 0x00008000,
@@ -729,6 +726,21 @@ int __init dm644x_init_video(struct vpfe_config *vpfe_cfg,
        return 0;
 }
 
+static const struct davinci_aintc_config dm644x_aintc_config = {
+       .reg = {
+               .start          = DAVINCI_ARM_INTC_BASE,
+               .end            = DAVINCI_ARM_INTC_BASE + SZ_4K - 1,
+               .flags          = IORESOURCE_MEM,
+       },
+       .num_irqs               = 64,
+       .prios                  = dm644x_default_priorities,
+};
+
+void __init dm644x_init_irq(void)
+{
+       davinci_aintc_init(&dm644x_aintc_config);
+}
+
 void __init dm644x_init_devices(void)
 {
        struct platform_device *edma_pdev;