This is a note to let you know that I've just added the patch titled

    ARM: at91: fix external interrupt specification in board code

to the 3.6-stable tree which can be found at:
    
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     arm-at91-fix-external-interrupt-specification-in-board-code.patch
and it can be found in the queue-3.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 69e7ea04c9365626c0963ff09bbaa3a1b49e293a Mon Sep 17 00:00:00 2001
From: Nicolas Ferre <nicolas.fe...@atmel.com>
Date: Wed, 24 Oct 2012 16:19:47 +0200
Subject: ARM: at91: fix external interrupt specification in board code

From: Nicolas Ferre <nicolas.fe...@atmel.com>

commit 69e7ea04c9365626c0963ff09bbaa3a1b49e293a upstream.

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.fe...@atmel.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagn...@jcrosoft.com>
Acked-by: Ludovic Desroches <ludovic.desroc...@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 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(-)

--- 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_
                .max_speed_hz   = 125000 * 16,
                .bus_num        = 0,
                .platform_data  = &ads_info,
-               .irq            = AT91SAM9263_ID_IRQ1,
+               .irq            = NR_IRQS_LEGACY + AT91SAM9263_ID_IRQ1,
        },
 #endif
 };
--- 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_devi
                .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
--- 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_devi
                .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
 };


Patches currently in stable-queue which might be from nicolas.fe...@atmel.com 
are

queue-3.6/arm-at91-i2c-change-id-to-let-i2c-gpio-work.patch
queue-3.6/arm-at91-tc-fix-typo-in-the-dt-document.patch
queue-3.6/arm-at91-at91sam9g10-fix-soc-type-detection.patch
queue-3.6/arm-at91-fix-external-interrupt-specification-in-board-code.patch
queue-3.6/arm-at91-fix-external-interrupts-in-non-dt-case.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to