mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Owen Kirby <osk@exegin.com>
To: barebox@lists.infradead.org
Subject: [PATCH] Fix AT91 UDC driver on boards without vbus.
Date: Wed, 16 Apr 2014 17:51:11 -0700	[thread overview]
Message-ID: <534F257F.8000106@exegin.com> (raw)

From 4ea2bd2e1ca18136d7cfd61643bc8d8187b1495f Mon Sep 17 00:00:00 2001
From: Owen Kirby <osk@exegin.com>
Date: Wed, 16 Apr 2014 17:45:18 -0700
Subject: [PATCH] Fix AT91 UDC driver on boards without vbus.

While porting Barebox to one of our boards, we found that the AT91 UDC driver
will fail to connect to USB hosts, and will spam the console with errors if
the VBUS pin isn't connected.

Signed-off-by: Owen Kirby <osk@exegin.com>
---
 drivers/usb/gadget/at91_udc.c |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 8ef1ad0..b66e949 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -1328,14 +1328,16 @@ int usb_gadget_poll(void)
 
 	if (!udc->udp_baseaddr)
 		return -ENODEV;
+    
+	if (gpio_is_valid(udc->board.vbus_pin)) {
+		value = gpio_get_value(udc->board.vbus_pin);
+		value ^= udc->board.vbus_active_low;
 
-	value = gpio_get_value(udc->board.vbus_pin);
-	value ^= udc->board.vbus_active_low;
-
-	udc->gpio_vbus_val = value;
+		udc->gpio_vbus_val = value;
 
-	if (!value)
-		return 0;
+		if (!value)
+			return 0;
+	}
 
 	value = at91_udp_read(udc, AT91_UDP_ISR) & (~(AT91_UDP_SOFINT));
 	if (value)
@@ -1501,14 +1503,14 @@ static int __init at91udc_probe(struct device_d *dev)
 		udc->vbus = gpio_get_value(udc->board.vbus_pin);
 		DBG(udc, "VBUS detection: host:%s \n",
 			udc->vbus ? "present":"absent");
+
+		dev_add_param_bool(dev, "vbus",
+			at91_udc_vbus_set, NULL, &udc->gpio_vbus_val, udc);
 	} else {
 		DBG(udc, "no VBUS detection, assuming always-on\n");
 		udc->vbus = 1;
 	}
 
-	dev_add_param_bool(dev, "vbus",
-			at91_udc_vbus_set, NULL, &udc->gpio_vbus_val, udc);
-
 	poller_register(&poller);
 
 	INFO(udc, "%s version %s\n", driver_name, DRIVER_VERSION);
-- 
1.7.9.5



_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

             reply	other threads:[~2014-04-17  0:59 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-17  0:51 Owen Kirby [this message]
2014-04-23  7:24 ` Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=534F257F.8000106@exegin.com \
    --to=osk@exegin.com \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox