Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd0f4275 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Sekhar Nori
Browse files

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: default avatarDavid Lechner <david@lechnology.com>
Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent 8b29f7aa

arch/arm/mach-davinci/dm355.c

+11 −0
Original line number Diff line number Diff line
@@ -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();

arch/arm/mach-davinci/dm365.c

+11 −0
Original line number Diff line number Diff line
@@ -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();

arch/arm/mach-davinci/dm644x.c

+11 −0
Original line number Diff line number Diff line
@@ -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();

arch/arm/mach-davinci/dm646x.c

+11 −0
Original line number Diff line number Diff line
@@ -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();