Commit 5cdbe5d2 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Gregory CLEMENT
Browse files

ARM: orion: use SPARSE_IRQ everywhere 



As a preparation for multiplatform support, this moves all the
code using plat-orion over to use sparse irq support, which is
enabled implicitly for multiplatform.

In particular, the hardcoded NR_IRQS macro gets replaced with
a machine specific one that is set in the machine descriptor
in order to set up a static mapping for all legacy interrupts.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
parent b8cd337c

arch/arm/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -515,6 +515,7 @@ config ARCH_DOVE 
	select PINCTRL

	select PINCTRL_DOVE

	select PLAT_ORION_LEGACY

	select SPARSE_IRQ

	help

	  Support for the Marvell Dove SoC 88AP510
@@ -527,6 +528,7 @@ config ARCH_MV78XX0 
	select MULTI_IRQ_HANDLER

	select PCI

	select PLAT_ORION_LEGACY

	select SPARSE_IRQ

	help

	  Support for the following Marvell MV78xx0 series SoCs:

	  MV781x0, MV782x0.
@@ -542,6 +544,7 @@ config ARCH_ORION5X 
	select PCI

	select PLAT_ORION_LEGACY

	select MULTI_IRQ_HANDLER

	select SPARSE_IRQ

	help

	  Support for the following Marvell Orion 5x series SoCs:

	  Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),

arch/arm/mach-dove/cm-a510.c

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ static void __init cm_a510_init(void) 


MACHINE_START(CM_A510, "Compulab CM-A510 Board")

	.atag_offset	= 0x100,

	.nr_irqs	= DOVE_NR_IRQS,

	.init_machine	= cm_a510_init,

	.map_io		= dove_map_io,

	.init_early	= dove_init_early,

arch/arm/mach-dove/dove-db-setup.c

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ static void __init dove_db_init(void) 


MACHINE_START(DOVE_DB, "Marvell DB-MV88AP510-BP Development Board")

	.atag_offset	= 0x100,

	.nr_irqs	= DOVE_NR_IRQS,

	.init_machine	= dove_db_init,

	.map_io		= dove_map_io,

	.init_early	= dove_init_early,

arch/arm/mach-dove/include/mach/dove.h

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
#ifndef __ASM_ARCH_DOVE_H

#define __ASM_ARCH_DOVE_H



#include <mach/irqs.h>



/*

 * Marvell Dove address maps.

 *

arch/arm/mach-dove/include/mach/irqs.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ 
#define NR_PMU_IRQS		7

#define IRQ_DOVE_RTC		(IRQ_DOVE_PMU_START + 5)



#define NR_IRQS			(IRQ_DOVE_PMU_START + NR_PMU_IRQS)

#define DOVE_NR_IRQS		(IRQ_DOVE_PMU_START + NR_PMU_IRQS)





#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE