| Message ID | 20190131133928.17985-23-brgl@bgdev.pl (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM: davinci: modernize the irq support | expand |
On 1/31/19 7:39 AM, Bartosz Golaszewski wrote: > From: Bartosz Golaszewski <bgolaszewski@baylibre.com> > > Add the new-style config structures for dm* SoCs. They will be used > once we make the cp-intc driver stop using davinci_soc_info. > > Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> > --- > arch/arm/mach-davinci/da830.c | 10 ++++++++++ > arch/arm/mach-davinci/da850.c | 10 ++++++++++ > 2 files changed, 20 insertions(+) > > diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c > index 8b9220badef5..6d3da4364f7a 100644 > --- 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> > @@ -742,6 +743,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, Missing minus one? + .end = DA8XX_CP_INTC_BASE + SZ_8K - 1, > + .flags = IORESOURCE_MEM, > + }, > + .num_irqs = DA830_N_CP_INTC_IRQ, > +}; > + > void __init da830_init_irqs(void) > { > cp_intc_init(); > diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c > index 9f48e1ac61fb..5e7f2c962abf 100644 > --- 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> > @@ -671,6 +672,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, same here > + .flags = IORESOURCE_MEM, > + }, > + .num_irqs = DA850_N_CP_INTC_IRQ, > +}; > + > void __init da850_init_irqs(void) > { > cp_intc_init(); >
On 31/01/19 7:09 PM, Bartosz Golaszewski wrote: > From: Bartosz Golaszewski <bgolaszewski@baylibre.com> > > Add the new-style config structures for dm* SoCs. They will be used da* SoCs. > once we make the cp-intc driver stop using davinci_soc_info. > > Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> > --- > arch/arm/mach-davinci/da830.c | 10 ++++++++++ > arch/arm/mach-davinci/da850.c | 10 ++++++++++ > 2 files changed, 20 insertions(+) Thanks, Sekhar
diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index 8b9220badef5..6d3da4364f7a 100644 --- 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> @@ -742,6 +743,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, + .flags = IORESOURCE_MEM, + }, + .num_irqs = DA830_N_CP_INTC_IRQ, +}; + void __init da830_init_irqs(void) { cp_intc_init(); diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 9f48e1ac61fb..5e7f2c962abf 100644 --- 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> @@ -671,6 +672,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, + .flags = IORESOURCE_MEM, + }, + .num_irqs = DA850_N_CP_INTC_IRQ, +}; + void __init da850_init_irqs(void) { cp_intc_init();