lkml.org 
[lkml]   [2019]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 16/37] ARM: davinci: aintc: use the new irqchip config structure in dm* SoCs
    Date
    From: Bartosz Golaszewski <bgolaszewski@baylibre.com>

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

    Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
    ---
    arch/arm/mach-davinci/dm355.c | 11 +++++++++++
    arch/arm/mach-davinci/dm365.c | 11 +++++++++++
    arch/arm/mach-davinci/dm644x.c | 11 +++++++++++
    arch/arm/mach-davinci/dm646x.c | 11 +++++++++++
    4 files changed, 44 insertions(+)

    diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
    index e2b680e9944b..ff79c1a17fae 100644
    --- 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 76507dcbcb3a..44dc3ca94dd3 100644
    --- 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 27c73bc54069..0b0ecac36486 100644
    --- 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 98fc5e3815b9..4e871d00e4e9 100644
    --- 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();
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-02-14 15:53    [W:4.069 / U:1.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site