| From 215c93372dd038546c978d231b7b9ed499622b0d Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Sat, 14 Dec 2013 15:45:01 +0100 |
| Subject: 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> |
| (cherry picked from commit b58c8e7b43ad804ad18b30f882b16da2e3d4ed9d) |
| (Queued by Simon Horman for v3.14 but not yet in Linus's tree) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-mackerel.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| 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"), |
| -- |
| 1.8.5.rc3 |
| |
