Commit 36f1a4ae authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: ep93xx: enable SPARSE_IRQ 



Without CONFIG_SPARSE_IRQ, we rely on mach/irqs.h to define NR_IRQS
globally. Do the minimal conversion by setting .nr_irqs in each
machine descriptor.

Only the vision_ep9307 machine has extra IRQs for GPIOs, so make
.nr_irqs the original value there, while using the plain NR_EP93XX_IRQS
everywhere else.

Cc: Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Hubert Feurstein <hubert.feurstein@contec.at>
Cc: Lukasz Majewski <lukma@denx.de>
Tested-by: default avatarAlexander Sverdlin <alexander.sverdlin@gmail.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 482c2727

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -358,6 +358,8 @@ config ARCH_EP93XX 
	select CPU_ARM920T

	select GPIOLIB

	select COMMON_CLK

	select IRQ_DOMAIN

	select SPARSE_IRQ

	help

	  This enables support for the Cirrus EP93xx series of CPUs.

arch/arm/mach-ep93xx/adssphere.c

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ static void __init adssphere_init_machine(void) 
MACHINE_START(ADSSPHERE, "ADS Sphere board")

	/* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */

	.atag_offset	= 0x100,

	.nr_irqs	= NR_EP93XX_IRQS,

	.map_io		= ep93xx_map_io,

	.init_irq	= ep93xx_init_irq,

	.init_time	= ep93xx_timer_init,

arch/arm/mach-ep93xx/core.c

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include <asm/mach/map.h>



#include "soc.h"

#include "irqs.h"



/*************************************************************************

 * Static I/O mappings that are needed for all EP93xx platforms

arch/arm/mach-ep93xx/edb93xx.c

+8 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ static void __init edb93xx_init_machine(void) 
MACHINE_START(EDB9301, "Cirrus Logic EDB9301 Evaluation Board")

	/* Maintainer: H Hartley Sweeten <hsweeten@visionengravers.com> */

	.atag_offset	= 0x100,

	.nr_irqs	= NR_EP93XX_IRQS,

	.map_io		= ep93xx_map_io,

	.init_irq	= ep93xx_init_irq,

	.init_time	= ep93xx_timer_init,
@@ -255,6 +256,7 @@ MACHINE_END 
MACHINE_START(EDB9302, "Cirrus Logic EDB9302 Evaluation Board")

	/* Maintainer: George Kashperko <george@chas.com.ua> */

	.atag_offset	= 0x100,

	.nr_irqs	= NR_EP93XX_IRQS,

	.map_io		= ep93xx_map_io,

	.init_irq	= ep93xx_init_irq,

	.init_time	= ep93xx_timer_init,
@@ -267,6 +269,7 @@ MACHINE_END 
MACHINE_START(EDB9302A, "Cirrus Logic EDB9302A Evaluation Board")

	/* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */

	.atag_offset	= 0x100,

	.nr_irqs	= NR_EP93XX_IRQS,

	.map_io		= ep93xx_map_io,

	.init_irq	= ep93xx_init_irq,

	.init_time	= ep93xx_timer_init,
@@ -279,6 +282,7 @@ MACHINE_END 
MACHINE_START(EDB9307, "Cirrus Logic EDB9307 Evaluation Board")

	/* Maintainer: Herbert Valerio Riedel <hvr@gnu.org> */

	.atag_offset	= 0x100,

	.nr_irqs	= NR_EP93XX_IRQS,

	.map_io		= ep93xx_map_io,

	.init_irq	= ep93xx_init_irq,

	.init_time	= ep93xx_timer_init,
@@ -291,6 +295,7 @@ MACHINE_END 
MACHINE_START(EDB9307A, "Cirrus Logic EDB9307A Evaluation Board")

	/* Maintainer: H Hartley Sweeten <hsweeten@visionengravers.com> */

	.atag_offset	= 0x100,

	.nr_irqs	= NR_EP93XX_IRQS,

	.map_io		= ep93xx_map_io,

	.init_irq	= ep93xx_init_irq,

	.init_time	= ep93xx_timer_init,
@@ -303,6 +308,7 @@ MACHINE_END 
MACHINE_START(EDB9312, "Cirrus Logic EDB9312 Evaluation Board")

	/* Maintainer: Toufeeq Hussain <toufeeq_hussain@infosys.com> */

	.atag_offset	= 0x100,

	.nr_irqs	= NR_EP93XX_IRQS,

	.map_io		= ep93xx_map_io,

	.init_irq	= ep93xx_init_irq,

	.init_time	= ep93xx_timer_init,
@@ -315,6 +321,7 @@ MACHINE_END 
MACHINE_START(EDB9315, "Cirrus Logic EDB9315 Evaluation Board")

	/* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */

	.atag_offset	= 0x100,

	.nr_irqs	= NR_EP93XX_IRQS,

	.map_io		= ep93xx_map_io,

	.init_irq	= ep93xx_init_irq,

	.init_time	= ep93xx_timer_init,
@@ -327,6 +334,7 @@ MACHINE_END 
MACHINE_START(EDB9315A, "Cirrus Logic EDB9315A Evaluation Board")

	/* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */

	.atag_offset	= 0x100,

	.nr_irqs	= NR_EP93XX_IRQS,

	.map_io		= ep93xx_map_io,

	.init_irq	= ep93xx_init_irq,

	.init_time	= ep93xx_timer_init,

arch/arm/mach-ep93xx/gesbc9312.c

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ static void __init gesbc9312_init_machine(void) 
MACHINE_START(GESBC9312, "Glomation GESBC-9312-sx")

	/* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */

	.atag_offset	= 0x100,

	.nr_irqs	= NR_EP93XX_IRQS,

	.map_io		= ep93xx_map_io,

	.init_irq	= ep93xx_init_irq,

	.init_time	= ep93xx_timer_init,