ARM: davinci: cp-intc: add the new config structures for da8xx SoCs

Add the new-style config structures for da8xx SoCs. They will be used
once we make the cp-intc 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/da830.c b/arch/arm/mach-davinci/da830.c
index 5cfd30c5742901e267dd03e15e0f21564c377961..38af72be1a85dd1b59b97b595a05b38d14e4fe22 100644 (file)
--- a/arch/arm/mach-davinci/da830.c
+++ b/arch/arm/mach-davinci/da830.c
@@ -12,6 +12,7 @@
 #include <linux/clk/davinci.h>
 #include <linux/gpio.h>
 #include <linux/init.h>
+#include <linux/irqchip/irq-davinci-cp-intc.h>
 #include <linux/platform_data/gpio-davinci.h>
 
 #include <asm/mach/map.h>
@@ -821,6 +822,15 @@ void __init da830_init(void)
        WARN(!da8xx_syscfg0_base, "Unable to map syscfg0 module");
 }
 
+static const struct davinci_cp_intc_config da830_cp_intc_config = {
+       .reg = {
+               .start          = DA8XX_CP_INTC_BASE,
+               .end            = DA8XX_CP_INTC_BASE + SZ_8K - 1,
+               .flags          = IORESOURCE_MEM,
+       },
+       .num_irqs               = DA830_N_CP_INTC_IRQ,
+};
+
 void __init da830_init_irq(void)
 {
        cp_intc_init();

diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 6df6994c0f261265af75e63b997929c7f276fe60..9a3ce68c0de478a47f39133ca71a1621100323ae 100644 (file)
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -18,6 +18,7 @@
 #include <linux/cpufreq.h>
 #include <linux/gpio.h>
 #include <linux/init.h>
+#include <linux/irqchip/irq-davinci-cp-intc.h>
 #include <linux/mfd/da8xx-cfgchip.h>
 #include <linux/platform_data/clk-da8xx-cfgchip.h>
 #include <linux/platform_data/clk-davinci-pll.h>
@@ -759,6 +760,15 @@ void __init da850_init(void)
        WARN(!da8xx_syscfg1_base, "Unable to map syscfg1 module");
 }
 
+static const struct davinci_cp_intc_config da850_cp_intc_config = {
+       .reg = {
+               .start          = DA8XX_CP_INTC_BASE,
+               .end            = DA8XX_CP_INTC_BASE + SZ_8K - 1,
+               .flags          = IORESOURCE_MEM,
+       },
+       .num_irqs               = DA850_N_CP_INTC_IRQ,
+};
+
 void __init da850_init_irq(void)
 {
        cp_intc_init();