From: Laurent Pinchart Date: Sat, 14 Dec 2013 14:45:01 +0000 (+0100) Subject: ARM: shmobile: mackerel: Fix USBHS pinconf entry X-Git-Tag: next-20140106~106^2~7^4 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b58c8e7b43ad804ad18b30f882b16da2e3d4ed9d;p=karo-tx-linux.git 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 Signed-off-by: Simon Horman --- 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"),