| From a813cd8b5610b2835106efa2eadcf23c48e5956b Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Fri, 19 Apr 2013 13:29:48 +0200 |
| Subject: ARM: shmobile: mackerel: Register pinctrl mapping for the ADXL34X |
| |
| Replace the GPIO-based ADXL34X 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> |
| (cherry picked from commit cd87d903f12c1baea6caf68e02e21ce7004c79a4) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-mackerel.c | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c |
| index fa3407da..d40d9dae 100644 |
| --- a/arch/arm/mach-shmobile/board-mackerel.c |
| +++ b/arch/arm/mach-shmobile/board-mackerel.c |
| @@ -1309,6 +1309,9 @@ static struct i2c_board_info i2c1_devices[] = { |
| }; |
| |
| static const struct pinctrl_map mackerel_pinctrl_map[] = { |
| + /* ADXL34X */ |
| + PIN_MAP_MUX_GROUP_DEFAULT("1-0053", "pfc-sh7372", |
| + "intc_irq21", "intc"), |
| /* SDHI0 */ |
| PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh7372", |
| "sdhi0_data4", "sdhi0"), |
| @@ -1460,8 +1463,7 @@ static void __init mackerel_init(void) |
| gpio_request(GPIO_FN_IRQ7_40, NULL); |
| irq_set_irq_type(IRQ7, IRQ_TYPE_LEVEL_LOW); |
| |
| - /* enable Accelerometer */ |
| - gpio_request(GPIO_FN_IRQ21, NULL); |
| + /* Accelerometer */ |
| irq_set_irq_type(IRQ21, IRQ_TYPE_LEVEL_HIGH); |
| |
| /* SDHI0 PORT172 card-detect IRQ26 */ |
| -- |
| 1.8.4.3.gca3854a |
| |
