aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/composite.c
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2012-09-10 03:16:07 -0400
committerFelipe Balbi <balbi@ti.com>2012-09-10 09:43:24 -0400
commited9cbda63d45638b69ce62412e3a3c7b00644835 (patch)
tree37db67a0df54bb9d9fb26b9e8c043b21551a3830 /drivers/usb/gadget/composite.c
parent9c6d196d5aa35e07482f23c3e37755e7a82140e0 (diff)
usb: gadget: remove usb_gadget_controller_number()
The bcdDevice field is defined as |Device release number in binary-coded decimal in the USB 2.0 specification. We use this field to distinguish the UDCs from each other. In theory this could be used on the host side to apply certain quirks if the "special" UDC in combination with this gadget is used. This hasn't been done as far as I am aware. In practice it would be better to fix the UDC driver before shipping since a later release might not need this quirk anymore. There are some driver in tree (on the host side) which use the bcdDevice field to figure out special workarounds for a given firmware revision. This seems to make sense. Therefore this patch converts all gadgets (except a few) to use the kernel version instead a random 2 or 3 plus the UDC number. The few that don't report kernel's version are: - webcam This one reports always a version 0x10 so allow it to do so in future. - nokia This one reports always 0x211. The comment says that this gadget works only if the UDC supports altsettings so I added a check for this. - serial This one reports 0x2400 + UDC number. Since the gadget version is 2.4 this could make sense. Therefore bcdDevice is 0x2400 here. I also remove various gadget_is_<name> macros which are unused. The remaining few macros should be moved to feature / bug bitfield. Acked-by: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/composite.c')
-rw-r--r--drivers/usb/gadget/composite.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index cacb273ba708..957f973dd96a 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1389,6 +1389,8 @@ static void update_unchanged_dev_desc(struct usb_device_descriptor *new,
1389 new->idProduct = idProduct; 1389 new->idProduct = idProduct;
1390 if (bcdDevice) 1390 if (bcdDevice)
1391 new->bcdDevice = bcdDevice; 1391 new->bcdDevice = bcdDevice;
1392 else
1393 new->bcdDevice = cpu_to_le16(get_default_bcdDevice());
1392 if (iSerialNumber) 1394 if (iSerialNumber)
1393 new->iSerialNumber = iSerialNumber; 1395 new->iSerialNumber = iSerialNumber;
1394 if (iManufacturer) 1396 if (iManufacturer)