diff options
| author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-03-13 03:23:50 +0100 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-03-15 13:34:11 +0100 |
| commit | f4243860c6045763ea5b9d2407090bc7deca0ce7 (patch) | |
| tree | 3954aaa9ad502bbf0052fb3b1167724be818f3a9 /arch/arm/mach-shmobile/board-kzm9g.c | |
| parent | fed94cf818e318f3c1a8eddbaed33b7342050a1b (diff) | |
| download | op-kernel-dev-f4243860c6045763ea5b9d2407090bc7deca0ce7.zip op-kernel-dev-f4243860c6045763ea5b9d2407090bc7deca0ce7.tar.gz | |
ARM: shmobile: kzm9g: Register pinctrl mappings for USB
Replace the GPIO-based USB pinmux configuration by pinctrl mappings.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Diffstat (limited to 'arch/arm/mach-shmobile/board-kzm9g.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-kzm9g.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c index 7427041..c1c0401 100644 --- a/arch/arm/mach-shmobile/board-kzm9g.c +++ b/arch/arm/mach-shmobile/board-kzm9g.c @@ -654,6 +654,9 @@ static const struct pinctrl_map kzm_pinctrl_map[] = { /* SMSC */ PIN_MAP_MUX_GROUP_DEFAULT("smsc911x.0", "pfc-sh73a0", "bsc_cs4", "bsc"), + /* USB */ + PIN_MAP_MUX_GROUP_DEFAULT("renesas_usbhs", "pfc-sh73a0", + "usb_vbus", "usb"), }; /* @@ -738,9 +741,6 @@ static void __init kzm_init(void) /* enable Micro SD */ gpio_request_one(14, GPIOF_OUT_INIT_HIGH, NULL); /* power */ - /* enable USB */ - gpio_request(GPIO_FN_VBUS_0, NULL); - #ifdef CONFIG_CACHE_L2X0 /* Early BRESP enable, Shared attribute override enable, 64K*8way */ l2x0_init(IOMEM(0xf0100000), 0x40460000, 0x82000fff); |
