[PATCH 4/8] ARM: at91: fix external interrupt specification in board code

[ludovic.desroches]

Le 10/24/2012 05:33 PM, Nicolas Ferre a écrit :
> Since the switch to sparse irq, we have to add the NR_IRQS_LEGACY
> offset to static irq numbers. It has been forgotten on these
> SPI irq definitions in board code.
>
> Signed-off-by: Nicolas Ferre <nicolas.ferre at atmel.com>

Acked-By: Ludovic Desroches <ludovic.desroches at atmel.com>

> Cc: stable <stable at vger.kernel.org> [v3.6]
> ---
>   arch/arm/mach-at91/board-neocore926.c | 2 +-
>   arch/arm/mach-at91/board-sam9261ek.c  | 2 +-
>   arch/arm/mach-at91/board-sam9263ek.c  | 2 +-
>   3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-at91/board-neocore926.c b/arch/arm/mach-at91/board-neocore926.c
> index 9cda3fd..6960778 100644
> --- a/arch/arm/mach-at91/board-neocore926.c
> +++ b/arch/arm/mach-at91/board-neocore926.c
> @@ -129,7 +129,7 @@ static struct spi_board_info neocore926_spi_devices[] = {
>   		.max_speed_hz	= 125000 * 16,
>   		.bus_num	= 0,
>   		.platform_data	= &ads_info,
> -		.irq		= AT91SAM9263_ID_IRQ1,
> +		.irq		= NR_IRQS_LEGACY + AT91SAM9263_ID_IRQ1,
>   	},
>   #endif
>   };
> diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c
> index 27b3af1..a9167dd 100644
> --- a/arch/arm/mach-at91/board-sam9261ek.c
> +++ b/arch/arm/mach-at91/board-sam9261ek.c
> @@ -309,7 +309,7 @@ static struct spi_board_info ek_spi_devices[] = {
>   		.max_speed_hz	= 125000 * 26,	/* (max sample rate @ 3V) * (cmd + data + overhead) */
>   		.bus_num	= 0,
>   		.platform_data	= &ads_info,
> -		.irq		= AT91SAM9261_ID_IRQ0,
> +		.irq		= NR_IRQS_LEGACY + AT91SAM9261_ID_IRQ0,
>   		.controller_data = (void *) AT91_PIN_PA28,	/* CS pin */
>   	},
>   #endif
> diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c
> index 073e174..b87dbe2 100644
> --- a/arch/arm/mach-at91/board-sam9263ek.c
> +++ b/arch/arm/mach-at91/board-sam9263ek.c
> @@ -132,7 +132,7 @@ static struct spi_board_info ek_spi_devices[] = {
>   		.max_speed_hz	= 125000 * 26,	/* (max sample rate @ 3V) * (cmd + data + overhead) */
>   		.bus_num	= 0,
>   		.platform_data	= &ads_info,
> -		.irq		= AT91SAM9263_ID_IRQ1,
> +		.irq		= NR_IRQS_LEGACY + AT91SAM9263_ID_IRQ1,
>   	},
>   #endif
>   };
>