summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2013-12-14 15:45:01 +0100
committerSimon Horman <horms+renesas@verge.net.au>2013-12-19 19:08:27 +0900
commitb58c8e7b43ad804ad18b30f882b16da2e3d4ed9d (patch)
treee9342557ee7bc8a08bac6b4a9ea37fd78d1cde35 /arch/arm
parent1d2bdbc3a8f93b8c1dfc95b2df89c266dd6ce9d0 (diff)
downloadlinux-b58c8e7b43ad804ad18b30f882b16da2e3d4ed9d.tar.bz2
ARM: shmobile: mackerel: Fix USBHS pinconf entry
Fix a typo in the USBHS1 pinconf entry that prevented the pull-down from being enabled. 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')
-rw-r--r--arch/arm/mach-shmobile/board-mackerel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 207acf0e07da..b3ee96e31b82 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -1406,7 +1406,7 @@ static const struct pinctrl_map mackerel_pinctrl_map[] = {
/* USBHS1 */
PIN_MAP_MUX_GROUP_DEFAULT("renesas_usbhs.1", "pfc-sh7372",
"usb1_vbus", "usb1"),
- PIN_MAP_CONFIGS_GROUP_DEFAULT("renesas_usbhs.&", "pfc-sh7372",
+ PIN_MAP_CONFIGS_GROUP_DEFAULT("renesas_usbhs.1", "pfc-sh7372",
"usb1_vbus", pin_pulldown_conf),
PIN_MAP_MUX_GROUP_DEFAULT("renesas_usbhs.1", "pfc-sh7372",
"usb1_otg_id_0", "usb1"),