| From 831f716282318852998dc6349fcee3aff7cb4303 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Thu, 18 Apr 2013 01:18:41 +0200 |
| Subject: ARM: shmobile: bonito: Register pinctrl mapping for BSC |
| |
| Replace the GPIO-based BSC 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 055b246946976616de6c7ba3acc1fd5a614b96b0) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-bonito.c | 13 ++++++------- |
| 1 file changed, 6 insertions(+), 7 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-bonito.c b/arch/arm/mach-shmobile/board-bonito.c |
| index 5076f4d5..2781c7fd 100644 |
| --- a/arch/arm/mach-shmobile/board-bonito.c |
| +++ b/arch/arm/mach-shmobile/board-bonito.c |
| @@ -377,6 +377,12 @@ static void __init bonito_map_io(void) |
| static const struct pinctrl_map fpga_pinctrl_map[] = { |
| /* FPGA */ |
| PIN_MAP_MUX_GROUP_DEFAULT("pfc-r8a7740", "pfc-r8a7740", |
| + "bsc_cs5a_0", "bsc"), |
| + PIN_MAP_MUX_GROUP_DEFAULT("pfc-r8a7740", "pfc-r8a7740", |
| + "bsc_cs5b", "bsc"), |
| + PIN_MAP_MUX_GROUP_DEFAULT("pfc-r8a7740", "pfc-r8a7740", |
| + "bsc_cs6a", "bsc"), |
| + PIN_MAP_MUX_GROUP_DEFAULT("pfc-r8a7740", "pfc-r8a7740", |
| "intc_irq10", "intc"), |
| }; |
| |
| @@ -419,13 +425,6 @@ static void __init bonito_init(void) |
| u16 bsw3; |
| u16 bsw4; |
| |
| - /* |
| - * FPGA |
| - */ |
| - gpio_request(GPIO_FN_CS5B, NULL); |
| - gpio_request(GPIO_FN_CS6A, NULL); |
| - gpio_request(GPIO_FN_CS5A_PORT105, NULL); |
| - |
| val = bonito_fpga_read(BVERR); |
| pr_info("bonito version: cpu %02x, base %02x\n", |
| ((val >> 8) & 0xFF), |
| -- |
| 1.8.4.3.gca3854a |
| |
