public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Heiko Schocher <hs@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 4/5] usb, g_dnl: make bcdDevice value configurable
Date: Mon,  4 Nov 2013 08:02:38 +0100	[thread overview]
Message-ID: <1383548559-8233-5-git-send-email-hs@denx.de> (raw)
In-Reply-To: <1383548559-8233-1-git-send-email-hs@denx.de>

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>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>

---
- changes for v2:
  add Acked-by from Lukasz Majewski
---
 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 7a3d507..48cc6a3 100644
--- a/drivers/usb/gadget/g_dnl.c
+++ b/drivers/usb/gadget/g_dnl.c
@@ -136,6 +136,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;
@@ -170,11 +187,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);
-- 
1.8.3.1

  parent reply	other threads:[~2013-11-04  7:02 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-04  7:02 [U-Boot] [PATCH v2 0/5] arm, am33xx: update for the am33xx based siemens boards Heiko Schocher
2013-11-04  7:02 ` [U-Boot] [PATCH v2 1/5] bootcount: store bootcount var in environment Heiko Schocher
2013-11-04  7:02 ` [U-Boot] [PATCH v2 2/5] arm, am33x: make RTC32K OSC enable configurable Heiko Schocher
2013-11-04  7:02 ` [U-Boot] [PATCH v2 3/5] usb, g_dnl: make iSerialNumber board configurable Heiko Schocher
2013-11-04 11:05   ` Lukasz Majewski
2013-11-04  7:02 ` Heiko Schocher [this message]
2013-11-04  7:02 ` [U-Boot] [PATCH v2 5/5] arm, am335x: update for the siemens boards Heiko Schocher
2013-11-04 12:45 ` [U-Boot] [PATCH v2 0/5] arm, am33xx: update for the am33xx based " Vaibhav Bedia
2013-11-04 13:15   ` Heiko Schocher
2013-11-04 13:24     ` Vaibhav Bedia
2013-11-04 17:34       ` Marek Vasut
2013-11-04 19:45         ` Vaibhav Bedia
2013-11-05  3:30           ` Heiko Schocher
2013-11-06 12:18             ` Vaibhav Bedia

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=1383548559-8233-5-git-send-email-hs@denx.de \
    --to=hs@denx.de \
    --cc=u-boot@lists.denx.de \
    /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