UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: shmobile: bonito: Register pinctrl mapping for SCIF 

Replace the GPIO-based SCIF 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>
This commit is contained in:
Laurent Pinchart 2013-04-18 01:18:41 +02:00 committed by Simon Horman
parent 6c887d2c09
commit 7cded0c90b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/mach-shmobile/board-bonito.c
View File

@ -369,6 +369,12 @@ static void __init bonito_map_io(void)
#define VCCQ1CR IOMEM(0xE6058140) #define VCCQ1CR IOMEM(0xE6058140)
#define VCCQ1LCDCR IOMEM(0xE6058186) #define VCCQ1LCDCR IOMEM(0xE6058186)
static const struct pinctrl_map scifa5_pinctrl_map[] = {
/* SCIFA5 */
PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.5", "pfc-r8a7740",
"scifa5_data_2", "scifa5"),
};
static void __init bonito_init(void) static void __init bonito_init(void)
{ {
u16 val; u16 val;
@ -423,8 +429,8 @@ static void __init bonito_init(void)
if (BIT_OFF(bsw2, 1) && /* S38.3 = ON */ if (BIT_OFF(bsw2, 1) && /* S38.3 = ON */
BIT_OFF(bsw3, 9) && /* S39.6 = ON */ BIT_OFF(bsw3, 9) && /* S39.6 = ON */
BIT_OFF(bsw4, 4)) { /* S43.1 = ON */ BIT_OFF(bsw4, 4)) { /* S43.1 = ON */
gpio_request(GPIO_FN_SCIFA5_TXD_PORT91, NULL); pinctrl_register_mappings(scifa5_pinctrl_map,
gpio_request(GPIO_FN_SCIFA5_RXD_PORT92, NULL); ARRAY_SIZE(scifa5_pinctrl_map));
} }
/* /*