---

yaml --- r: 195327 b: refs/heads/master c: 6ddc6da h: refs/heads/master i: 195325: c22cbef 195323: d25268a 195319: d6cac39 195311: 833a202 195295: 5e66702 195263: 212813a 195199: bf46c74 195071: 38bb1ea v: v3
git-mirror · May 20, 2010 · 184b646 · 184b646
1 parent a52c288
commit 184b646
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb9c58edf13fc30d160ce52018576a1d7d45d795
+refs/heads/master: 6ddc6dae4ab559b648bc348e3a48e113e92ab4a2
diff --git a/trunk/drivers/usb/musb/blackfin.c b/trunk/drivers/usb/musb/blackfin.c
@@ -238,10 +238,10 @@ static void bfin_vbus_power(struct musb *musb, int is_on, int sleeping)
 
 static void bfin_set_vbus(struct musb *musb, int is_on)
 {
-	if (is_on)
-		gpio_set_value(musb->config->gpio_vrsel, 1);
-	else
-		gpio_set_value(musb->config->gpio_vrsel, 0);
+	int value = musb->config->gpio_vrsel_active;
+	if (!is_on)
+		value = !value;
+	gpio_set_value(musb->config->gpio_vrsel, value);
 
 	DBG(1, "VBUS %s, devctl %02x "
 		/* otg %3x conf %08x prcm %08x */ "\n",

diff --git a/trunk/include/linux/usb/musb.h b/trunk/include/linux/usb/musb.h
@@ -88,6 +88,7 @@ struct musb_hdrc_config {
 #ifdef CONFIG_BLACKFIN
         /* A GPIO controlling VRSEL in Blackfin */
         unsigned int    gpio_vrsel;
+	unsigned int	gpio_vrsel_active;
 #endif
 
 };