diff options
| author |   Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-04-19 13:29:48 +0200 |
|---|---|---|
| committer |   Simon Horman <horms+renesas@verge.net.au> | 2013-06-04 21:04:13 +0900 |
| commit | 886c5353a821b28939f095ea2394e6d471f11be0 (patch) | |
| tree | e23aa606ce70aef06f6f37eea8fa9210ed7c2233 /arch/arm/mach-shmobile/board-mackerel.c | |
| parent | ARM: shmobile: mackerel: Register pinctrl mapping for SCIF (diff) | |
| download | linux-dev-886c5353a821b28939f095ea2394e6d471f11be0.tar.xz linux-dev-886c5353a821b28939f095ea2394e6d471f11be0.zip | |
ARM: shmobile: mackerel: Register IRQ pinctrl mapping for SDHI0
Replace the GPIO-based SDHI0 IRQ pinmux configuration by a pinctrl
mapping.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/board-mackerel.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-mackerel.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index bd3666bc36e2..4be236d1dfb4 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c @@ -1359,6 +1359,8 @@ static const struct pinctrl_map mackerel_pinctrl_map[] = { "sdhi0_ctrl", "sdhi0"), PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh7372", "sdhi0_wp", "sdhi0"), + PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh7372", + "intc_irq26_1", "intc"), /* SDHI1 */ #if !IS_ENABLED(CONFIG_MMC_SH_MMCIF) PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.1", "pfc-sh7372", @@ -1469,9 +1471,6 @@ static void __init mackerel_init(void) /* Accelerometer */ irq_set_irq_type(IRQ21, IRQ_TYPE_LEVEL_HIGH); - /* SDHI0 PORT172 card-detect IRQ26 */ - gpio_request(GPIO_FN_IRQ26_172, NULL); - /* Reset HDMI, must be held at least one EXTALR (32768Hz) period */ srcr4 = __raw_readl(SRCR4); __raw_writel(srcr4 | (1 << 13), SRCR4); |