Commit 375dec92 authored by Russell King's avatar Russell King
Browse files

ARM: 7343/1: sa11x0: convert to sparse IRQ 

Now that Neponset, UCB1x00 and SA1111 are all converted to use the IRQ
allocation interfaces, we can enable sparse IRQ support for SA11x0
platforms.
parent f314f33b

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -760,6 +760,7 @@ config ARCH_SA1100 
	select ARCH_REQUIRE_GPIOLIB

	select HAVE_IDE

	select NEED_MACH_MEMORY_H

	select SPARSE_IRQ

	help

	  Support for StrongARM 11x0 based boards.

arch/arm/mach-sa1100/badge4.c

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ static void badge4_sa1111_disable(void *data, unsigned devid) 
}



static struct sa1111_platform_data sa1111_info = {

	.irq_base	= IRQ_BOARD_END,

	.disable_devs	= SA1111_DEVID_PS2_MSE,

	.enable		= badge4_sa1111_enable,

	.disable	= badge4_sa1111_disable,

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

+12 −9
Original line number Diff line number Diff line
@@ -71,16 +71,19 @@ 
/*

 * Figure out the MAX IRQ number.

 *

 * If we have an SA1111, the max IRQ is S1_BVD1_STSCHG+1.

 * If we have an LoCoMo, the max IRQ is IRQ_BOARD_START + 4

 * Otherwise, we have the standard IRQs only.

 * Neponset, SA1111 and UCB1x00 are sparse IRQ aware, so can dynamically

 * allocate their IRQs above NR_IRQS.

 *

 * LoCoMo has 4 additional IRQs, but is not sparse IRQ aware, and so has

 * to be included in the NR_IRQS calculation.

 */

#ifdef CONFIG_SA1111

#define NR_IRQS			(IRQ_BOARD_END + 55)

#elif defined(CONFIG_SHARP_LOCOMO)

#define NR_IRQS			(IRQ_BOARD_START + 4)

#ifdef CONFIG_SHARP_LOCOMO

#define NR_IRQS_LOCOMO		4

#else

#define NR_IRQS			(IRQ_BOARD_START)

#define NR_IRQS_LOCOMO		0

#endif



#define SA1100_NR_IRQS NR_IRQS
 
#ifndef NR_IRQS

#define NR_IRQS (IRQ_BOARD_START + NR_IRQS_LOCOMO)

#endif

#define SA1100_NR_IRQS (IRQ_BOARD_START + NR_IRQS_LOCOMO)

arch/arm/mach-sa1100/jornada720.c

+0 −1
Original line number Diff line number Diff line
@@ -195,7 +195,6 @@ static struct resource sa1111_resources[] = { 
};



static struct sa1111_platform_data sa1111_info = {

	.irq_base	= IRQ_BOARD_END,

	.disable_devs	= SA1111_DEVID_PS2_MSE,

};

arch/arm/mach-sa1100/neponset.c

+0 −1
Original line number Diff line number Diff line
@@ -229,7 +229,6 @@ static struct irq_chip nochip = { 
};



static struct sa1111_platform_data sa1111_info = {

	.irq_base	= IRQ_BOARD_END,

	.disable_devs	= SA1111_DEVID_PS2_MSE,

};