commit c3622f5c38f3841414a17d2f45e4c18e70d5154b
author Linux Build Service Account <lnxbuild@localhost> Mon Oct 07 15:31:20 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Oct 07 15:31:15 2013 -0700
tree bc268e03f1ff9261afa7b1e5aa96dec65c204d6a
parent 010d6421cb0e93717f7b536257f3e6d5105ab247
parent 0d6ed96e87f6ca965e7c8300533321b461b10add

Merge "msm: 8926: add support for HSIC"

arch/arm/mach-msm/board-8226-gpiomux.c

diff --git a/arch/arm/mach-msm/board-8226-gpiomux.c b/arch/arm/mach-msm/board-8226-gpiomux.c
index 6b54b4c..4dcbc3a 100644
--- a/arch/arm/mach-msm/board-8226-gpiomux.c
+++ b/arch/arm/mach-msm/board-8226-gpiomux.c
@@ -863,6 +863,10 @@
 	 * be disabled when ethernet config is enabled.
 	 */
 #ifdef CONFIG_USB_EHCI_MSM_HSIC
+	if (machine_is_msm8926()) {
+		msm_hsic_configs[0].gpio = 119; /* STROBE */
+		msm_hsic_configs[1].gpio = 120; /* DATA */
+	}
 	msm_gpiomux_install(msm_hsic_configs, ARRAY_SIZE(msm_hsic_configs));
 #endif
 }