diff options
| author | Olof Johansson | 2012-06-24 23:01:52 +0200 |
|---|---|---|
| committer | Olof Johansson | 2012-06-24 23:01:52 +0200 |
| commit | acf6a7ecbddfc84c66408ac549509d97c2ab4f8a (patch) | |
| tree | baee0401ece11f34add5ab0607788e2a7d6bf405 /arch/arm/mach-shmobile/board-mackerel.c | |
| parent | Linux 3.5-rc4 (diff) | |
| parent | ARM: shmobile: r8a7779: Route all interrupts to ARM (diff) | |
| download | kernel-qcow2-linux-acf6a7ecbddfc84c66408ac549509d97c2ab4f8a.tar.gz kernel-qcow2-linux-acf6a7ecbddfc84c66408ac549509d97c2ab4f8a.tar.xz kernel-qcow2-linux-acf6a7ecbddfc84c66408ac549509d97c2ab4f8a.zip | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into fixes
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas:
ARM: shmobile: r8a7779: Route all interrupts to ARM
ARM: shmobile: kzm9d: use late init machine hook
ARM: shmobile: kzm9g: use late init machine hook
ARM: mach-shmobile: armadillo800eva: Use late init machine hook
ARM: mach-shmobile: add missing GPIO IRQ configuration on mackerel
ARM: mach-shmobile: Fix build when SMP is enabled and EMEV2 is not enabled
ARM: shmobile: sh7372: bugfix: chclr_offset base
ARM: shmobile: sh73a0: bugfix: SY-DMAC number
Diffstat (limited to 'arch/arm/mach-shmobile/board-mackerel.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-mackerel.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index b577f7c44678..150122a44630 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c @@ -1512,6 +1512,9 @@ static void __init mackerel_init(void) gpio_request(GPIO_FN_SDHID0_1, NULL); gpio_request(GPIO_FN_SDHID0_0, NULL); + /* SDHI0 PORT172 card-detect IRQ26 */ + gpio_request(GPIO_FN_IRQ26_172, NULL); + #if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE) /* enable SDHI1 */ gpio_request(GPIO_FN_SDHICMD1, NULL); |