From 184b6469b15d6ca747b06b803f2d9bef1d0d2602 Mon Sep 17 00:00:00 2001
From: Cliff Cai <cliff.cai@analog.com>
Date: Fri, 12 Mar 2010 10:29:10 +0200
Subject: [PATCH] --- yaml --- r: 195327 b: refs/heads/master c:
 6ddc6dae4ab559b648bc348e3a48e113e92ab4a2 h: refs/heads/master i:   195325:
 c22cbef7c33fc963aff62cb7ed4662f767d1d2ca   195323:
 d25268a9a00379c742d719a5ac82dbde2460191b   195319:
 d6cac39d0b297e4eda81fc383c0bb39d5d02fa2b   195311:
 833a2022c3e95cf7365f69483ffadfef67e62b1c   195295:
 5e66702883c12a771406e370d3891b1c19172dd2   195263:
 212813a089d1f17513c29843a0240caaed164900   195199:
 bf46c74b2e2aab2256f5d5ff4d6d2c07e9108bd5   195071:
 38bb1eab7bbbaeb5370b5450ff131200fb9d37ad v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/usb/musb/blackfin.c | 8 ++++----
 trunk/include/linux/usb/musb.h    | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index cfadc3a30e02..809dd1a9e373 100644
--- 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
index 7c71eb422a9c..eb4392f904e4 100644
--- 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
index f3d68f62dae8..fbb83fe21851 100644
--- 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
 
 };