ARM: davinci: aintc: use the new irqchip config structure in dm* SoCs

Add the new-style config structures for dm* SoCs. They will be used
once we make the aintc driver stop using davinci_soc_info.

Reviewed-by: David Lechner <david@lechnology.com>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index e2b680e9944b679c2ecdf7934fdd0ef4bfdf77e9..ff79c1a17fae731ecf59d0d1b399fb7cc8cb3ef0 100644 (file)
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -15,6 +15,7 @@
 #include <linux/dma-mapping.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_data/spi-davinci.h>
@@ -792,6 +793,16 @@ int __init dm355_init_video(struct vpfe_config *vpfe_cfg,
        return 0;
 }
 
+static const struct davinci_aintc_config dm355_aintc_config = {
+       .reg = {
+               .start          = DAVINCI_ARM_INTC_BASE,
+               .end            = DAVINCI_ARM_INTC_BASE + SZ_4K - 1,
+               .flags          = IORESOURCE_MEM,
+       },
+       .num_irqs               = 64,
+       .prios                  = dm355_default_priorities,
+};
+
 void __init dm355_init_irq(void)
 {
        davinci_aintc_init();

diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index 76507dcbcb3ac7ccad4e8668d2a06773d3540840..44dc3ca94dd37391ee9b467b3d4ab8b5436c6dbc 100644 (file)
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -19,6 +19,7 @@
 #include <linux/dma-mapping.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_data/keyscan-davinci.h>
@@ -1051,6 +1052,16 @@ int __init dm365_init_video(struct vpfe_config *vpfe_cfg,
        return 0;
 }
 
+static const struct davinci_aintc_config dm365_aintc_config = {
+       .reg = {
+               .start          = DAVINCI_ARM_INTC_BASE,
+               .end            = DAVINCI_ARM_INTC_BASE + SZ_4K - 1,
+               .flags          = IORESOURCE_MEM,
+       },
+       .num_irqs               = 64,
+       .prios                  = dm365_default_priorities,
+};
+
 void __init dm365_init_irq(void)
 {
        davinci_aintc_init();

diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 27c73bc54069d98aad4728ba17f7d7899389cca0..0b0ecac364869fca92c385b9e16f12412a893730 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>
@@ -728,6 +729,16 @@ 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();

diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index 98fc5e3815b90d554ae0340c3ffdf7e2999a9709..4e871d00e4e94b71260c6db1fd79e232f363b2b5 100644 (file)
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -15,6 +15,7 @@
 #include <linux/dma-mapping.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>
@@ -689,6 +690,16 @@ void __init dm646x_register_clocks(void)
        platform_device_register(&dm646x_pll2_device);
 }
 
+static const struct davinci_aintc_config dm646x_aintc_config = {
+       .reg = {
+               .start          = DAVINCI_ARM_INTC_BASE,
+               .end            = DAVINCI_ARM_INTC_BASE + SZ_4K - 1,
+               .flags          = IORESOURCE_MEM,
+       },
+       .num_irqs               = 64,
+       .prios                  = dm646x_default_priorities,
+};
+
 void __init dm646x_init_irq(void)
 {
        davinci_aintc_init();