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 27c73bc54069d98aad4728ba17f7d7899389cca0..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>
@@ -645,9 +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_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,
@@ -728,9 +726,19 @@ 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();
+       davinci_aintc_init(&dm644x_aintc_config);
 }
 
 void __init dm644x_init_devices(void)