aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile
diff options
context:
space:
mode:
authorBastian Hecht <hechtb@gmail.com>2012-11-20 01:05:00 +0100
committerSimon Horman <horms@verge.net.au>2012-11-20 09:14:43 +0900
commit3042ac5731e6db441dfce85612da4aa3913dab3b (patch)
treeae8902b6e6f2de03946b70f277db8ba7374b1fb6 /arch/arm/mach-shmobile
parentARM: shmobile: use FSI driver's audio clock on ap4evb (diff)
downloadlinux-dev-3042ac5731e6db441dfce85612da4aa3913dab3b.tar.xz
linux-dev-3042ac5731e6db441dfce85612da4aa3913dab3b.zip
ARM: shmobile: mackerel: Add FLCTL IRQ resource
Since commit 3c7ea4e (mtd: sh_flctl: Add support for error IRQ) the sh_flctl driver requires the error IRQ line to signal failed transactions between the flash controller and the NAND chip. This information is mandatory - else the driver refuses to start up. We provide it here for the board mackerel. Signed-off-by: Bastian Hecht <hechtb@gmail.com> Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile')
-rw-r--r--arch/arm/mach-shmobile/board-mackerel.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index bf2bcb92b426..3f56e70795b7 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -950,7 +950,11 @@ static struct resource nand_flash_resources[] = {
.start = 0xe6a30000,
.end = 0xe6a3009b,
.flags = IORESOURCE_MEM,
- }
+ },
+ [1] = {
+ .start = evt2irq(0x0d80), /* flstei: status error irq */
+ .flags = IORESOURCE_IRQ,
+ },
};
static struct sh_flctl_platform_data nand_flash_data = {