summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorRobert Jarzmik <robert.jarzmik@free.fr>2011-12-19 10:17:17 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2011-12-21 11:15:31 +0100
commit58c2526c9dc7b01260b1d0d2d74d4f807ad764ad (patch)
treee983c9d14f6daea6c64586ee31568d4198e6d35c /drivers/usb
parentc7dad7bc16489aaeeff4674fc54a6571e650f9a5 (diff)
downloadbarebox-58c2526c9dc7b01260b1d0d2d74d4f807ad764ad.tar.gz
usb/gadget: add special treatment for PXA cpus
As PXA cpus suffer from a silicon bug which prevents them from being compound devices, forbid use_acm=1 for PXAs. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/gadget/serial.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c
index f6a712b1c4..8ba9ab59a3 100644
--- a/drivers/usb/gadget/serial.c
+++ b/drivers/usb/gadget/serial.c
@@ -179,6 +179,14 @@ static int __init gserial_init(void)
/* We *could* export two configs; that'd be much cleaner...
* but neither of these product IDs was defined that way.
*/
+
+ /*
+ * PXA CPU suffer a silicon bug which prevents them from being a
+ * compound device, forbiding the ACM configurations.
+ */
+#ifdef CONFIG_ARCH_PXA2XX
+ use_acm = 0;
+#endif
if (use_acm) {
serial_config_driver.label = "CDC ACM config";
serial_config_driver.bConfigurationValue = 2;
@@ -204,4 +212,3 @@ static int __init gserial_init(void)
}
late_initcall(gserial_init);
-