| Message ID | 1382437545-23720-5-git-send-email-hs@denx.de |
|---|---|
| State | Deferred |
| Delegated to: | Tom Rini |
| Headers | show |
Hi Heiko, > add the possibility to set the bcdDevice number board specific. > Therefore the weak function g_dnl_get_board_bcd_device_number() > is introduced. Used on the siemens boards. Acked-by: Lukasz Majewski <l.majewski@samsung.com> > > Signed-off-by: Heiko Schocher <hs@denx.de> > Cc: Marek Vasut <marek.vasut@gmail.com> > Cc: Lukasz Majewski <l.majewski@samsung.com> > Cc: Kyungmin Park <kyungmin.park@samsung.com> > --- > drivers/usb/gadget/g_dnl.c | 23 +++++++++++++++++++---- > 1 file changed, 19 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c > index 5f09d66..942920e 100644 > --- a/drivers/usb/gadget/g_dnl.c > +++ b/drivers/usb/gadget/g_dnl.c > @@ -142,6 +142,23 @@ int g_dnl_bind_fixup(struct > usb_device_descriptor *dev) return 0; > } > > +__weak int g_dnl_get_board_bcd_device_number(int gcnum) > +{ > + return gcnum; > +} > + > +static int g_dnl_get_bcd_device_number(struct usb_composite_dev > *cdev) +{ > + struct usb_gadget *gadget = cdev->gadget; > + int gcnum; > + > + gcnum = usb_gadget_controller_number(gadget); > + if (gcnum > 0) > + gcnum += 0x200; > + > + return g_dnl_get_board_bcd_device_number(gcnum); > +} > + > static int g_dnl_bind(struct usb_composite_dev *cdev) > { > struct usb_gadget *gadget = cdev->gadget; > @@ -178,11 +195,9 @@ static int g_dnl_bind(struct usb_composite_dev > *cdev) if (ret) > goto error; > > - gcnum = usb_gadget_controller_number(gadget); > - > - debug("gcnum: %d\n", gcnum); > + gcnum = g_dnl_get_bcd_device_number(cdev); > if (gcnum >= 0) > - device_desc.bcdDevice = cpu_to_le16(0x0200 + gcnum); > + device_desc.bcdDevice = cpu_to_le16(gcnum); > else { > debug("%s: controller '%s' not recognized\n", > shortname, gadget->name);
diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c index 5f09d66..942920e 100644 --- a/drivers/usb/gadget/g_dnl.c +++ b/drivers/usb/gadget/g_dnl.c @@ -142,6 +142,23 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev) return 0; } +__weak int g_dnl_get_board_bcd_device_number(int gcnum) +{ + return gcnum; +} + +static int g_dnl_get_bcd_device_number(struct usb_composite_dev *cdev) +{ + struct usb_gadget *gadget = cdev->gadget; + int gcnum; + + gcnum = usb_gadget_controller_number(gadget); + if (gcnum > 0) + gcnum += 0x200; + + return g_dnl_get_board_bcd_device_number(gcnum); +} + static int g_dnl_bind(struct usb_composite_dev *cdev) { struct usb_gadget *gadget = cdev->gadget; @@ -178,11 +195,9 @@ static int g_dnl_bind(struct usb_composite_dev *cdev) if (ret) goto error; - gcnum = usb_gadget_controller_number(gadget); - - debug("gcnum: %d\n", gcnum); + gcnum = g_dnl_get_bcd_device_number(cdev); if (gcnum >= 0) - device_desc.bcdDevice = cpu_to_le16(0x0200 + gcnum); + device_desc.bcdDevice = cpu_to_le16(gcnum); else { debug("%s: controller '%s' not recognized\n", shortname, gadget->name);
add the possibility to set the bcdDevice number board specific. Therefore the weak function g_dnl_get_board_bcd_device_number() is introduced. Used on the siemens boards. Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Lukasz Majewski <l.majewski@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> --- drivers/usb/gadget/g_dnl.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-)