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

Commit bd808947 authored by Cyril Chemparathy's avatar Cyril Chemparathy Committed by Kevin Hilman
Browse files

Davinci: aintc/cpintc - use ioremap() 



This patch implements the following:

 - interrupt initialization uses ioremap() instead of passing a virtual address
   via davinci_soc_info.

 - machine definitions directly point to cp_intc_init() or davinci_irq_init()

 - davinci_intc_type and davinci_intc_base now get initialized in controller
   specific init functions instead of davinci_common_init()

 - minor fix in davinci_irq_init() to use intc_irq_num instead of
   DAVINCI_N_AINTC_IRQ

Signed-off-by: default avatarCyril Chemparathy <cyril@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent e4c822c7

arch/arm/mach-davinci/board-da830-evm.c

+1 −9
Original line number Original line Diff line number Diff line
@@ -561,14 +561,6 @@ static int __init da830_evm_console_init(void) 
console_initcall(da830_evm_console_init);

console_initcall(da830_evm_console_init);

#endif

#endif





static __init void da830_evm_irq_init(void)

{

	struct davinci_soc_info *soc_info = &davinci_soc_info;



	cp_intc_init((void __iomem *)DA8XX_CP_INTC_VIRT, DA830_N_CP_INTC_IRQ,

			soc_info->intc_irq_prios, NULL);

}



static void __init da830_evm_map_io(void)

static void __init da830_evm_map_io(void)

{

{

	da830_init();

	da830_init();
@@ -579,7 +571,7 @@ MACHINE_START(DAVINCI_DA830_EVM, "DaVinci DA830/OMAP-L137 EVM") 
	.io_pg_offst	= (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,

	.io_pg_offst	= (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,

	.boot_params	= (DA8XX_DDR_BASE + 0x100),

	.boot_params	= (DA8XX_DDR_BASE + 0x100),

	.map_io		= da830_evm_map_io,

	.map_io		= da830_evm_map_io,

	.init_irq	= da830_evm_irq_init,

	.init_irq	= cp_intc_init,

	.timer		= &davinci_timer,

	.timer		= &davinci_timer,

	.init_machine	= da830_evm_init,

	.init_machine	= da830_evm_init,

MACHINE_END
 
MACHINE_END

arch/arm/mach-davinci/board-da850-evm.c

+1 −9
Original line number Original line Diff line number Diff line
@@ -736,14 +736,6 @@ static int __init da850_evm_console_init(void) 
console_initcall(da850_evm_console_init);

console_initcall(da850_evm_console_init);

#endif

#endif





static __init void da850_evm_irq_init(void)

{

	struct davinci_soc_info *soc_info = &davinci_soc_info;



	cp_intc_init((void __iomem *)DA8XX_CP_INTC_VIRT, DA850_N_CP_INTC_IRQ,

			soc_info->intc_irq_prios, NULL);

}



static void __init da850_evm_map_io(void)

static void __init da850_evm_map_io(void)

{

{

	da850_init();

	da850_init();
@@ -754,7 +746,7 @@ MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138 EVM") 
	.io_pg_offst	= (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,

	.io_pg_offst	= (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,

	.boot_params	= (DA8XX_DDR_BASE + 0x100),

	.boot_params	= (DA8XX_DDR_BASE + 0x100),

	.map_io		= da850_evm_map_io,

	.map_io		= da850_evm_map_io,

	.init_irq	= da850_evm_irq_init,

	.init_irq	= cp_intc_init,

	.timer		= &davinci_timer,

	.timer		= &davinci_timer,

	.init_machine	= da850_evm_init,

	.init_machine	= da850_evm_init,

MACHINE_END
 
MACHINE_END

arch/arm/mach-davinci/board-dm355-evm.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -350,17 +350,12 @@ static __init void dm355_evm_init(void) 
	dm355_init_asp1(ASP1_TX_EVT_EN | ASP1_RX_EVT_EN, &dm355_evm_snd_data);

	dm355_init_asp1(ASP1_TX_EVT_EN | ASP1_RX_EVT_EN, &dm355_evm_snd_data);

}

}





static __init void dm355_evm_irq_init(void)

{

	davinci_irq_init();

}



MACHINE_START(DAVINCI_DM355_EVM, "DaVinci DM355 EVM")

MACHINE_START(DAVINCI_DM355_EVM, "DaVinci DM355 EVM")

	.phys_io      = IO_PHYS,

	.phys_io      = IO_PHYS,

	.io_pg_offst  = (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,

	.io_pg_offst  = (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,

	.boot_params  = (0x80000100),

	.boot_params  = (0x80000100),

	.map_io	      = dm355_evm_map_io,

	.map_io	      = dm355_evm_map_io,

	.init_irq     = dm355_evm_irq_init,

	.init_irq     = davinci_irq_init,

	.timer	      = &davinci_timer,

	.timer	      = &davinci_timer,

	.init_machine = dm355_evm_init,

	.init_machine = dm355_evm_init,

MACHINE_END
 
MACHINE_END

arch/arm/mach-davinci/board-dm355-leopard.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -269,17 +269,12 @@ static __init void dm355_leopard_init(void) 
			ARRAY_SIZE(dm355_leopard_spi_info));

			ARRAY_SIZE(dm355_leopard_spi_info));

}

}





static __init void dm355_leopard_irq_init(void)

{

	davinci_irq_init();

}



MACHINE_START(DM355_LEOPARD, "DaVinci DM355 leopard")

MACHINE_START(DM355_LEOPARD, "DaVinci DM355 leopard")

	.phys_io      = IO_PHYS,

	.phys_io      = IO_PHYS,

	.io_pg_offst  = (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,

	.io_pg_offst  = (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,

	.boot_params  = (0x80000100),

	.boot_params  = (0x80000100),

	.map_io	      = dm355_leopard_map_io,

	.map_io	      = dm355_leopard_map_io,

	.init_irq     = dm355_leopard_irq_init,

	.init_irq     = davinci_irq_init,

	.timer	      = &davinci_timer,

	.timer	      = &davinci_timer,

	.init_machine = dm355_leopard_init,

	.init_machine = dm355_leopard_init,

MACHINE_END
 
MACHINE_END

arch/arm/mach-davinci/board-dm365-evm.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -608,17 +608,12 @@ static __init void dm365_evm_init(void) 
			ARRAY_SIZE(dm365_evm_spi_info));

			ARRAY_SIZE(dm365_evm_spi_info));

}

}





static __init void dm365_evm_irq_init(void)

{

	davinci_irq_init();

}



MACHINE_START(DAVINCI_DM365_EVM, "DaVinci DM365 EVM")

MACHINE_START(DAVINCI_DM365_EVM, "DaVinci DM365 EVM")

	.phys_io	= IO_PHYS,

	.phys_io	= IO_PHYS,

	.io_pg_offst	= (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,

	.io_pg_offst	= (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,

	.boot_params	= (0x80000100),

	.boot_params	= (0x80000100),

	.map_io		= dm365_evm_map_io,

	.map_io		= dm365_evm_map_io,

	.init_irq	= dm365_evm_irq_init,

	.init_irq	= davinci_irq_init,

	.timer		= &davinci_timer,

	.timer		= &davinci_timer,

	.init_machine	= dm365_evm_init,

	.init_machine	= dm365_evm_init,

MACHINE_END

MACHINE_END