mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Alexander Shiyan <shc_work@mail.ru>
To: barebox@lists.infradead.org
Subject: [PATCH 2/6] Add ULPI detection function.
Date: Sat, 24 Mar 2012 18:00:36 +0400	[thread overview]
Message-ID: <1332597640-31268-2-git-send-email-shc_work@mail.ru> (raw)
In-Reply-To: <1332597640-31268-1-git-send-email-shc_work@mail.ru>

Added ULPI detection function.
Same function from isp1504 driver removed.
Used implementation from Linux kernel.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 drivers/usb/otg/isp1504.c |   12 ++----------
 drivers/usb/otg/ulpi.c    |   45 +++++++++++++++++++++++++++++++++++++++++++++
 include/usb/ulpi.h        |    1 +
 3 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/drivers/usb/otg/isp1504.c b/drivers/usb/otg/isp1504.c
index 9884df4..c093a3a 100644
--- a/drivers/usb/otg/isp1504.c
+++ b/drivers/usb/otg/isp1504.c
@@ -4,18 +4,10 @@
 
 int isp1504_set_vbus_power(void __iomem *view, int on)
 {
-	int vid, pid, ret = 0;
+	int ret = 0;
 
-	vid = (ulpi_read(ULPI_VID_HIGH, view) << 8) |
-		ulpi_read(ULPI_VID_LOW, view);
-	pid = (ulpi_read(ULPI_PID_HIGH, view) << 8) |
-		ulpi_read(ULPI_PID_LOW, view);
-
-	pr_info("ULPI Vendor ID 0x%x    Product ID 0x%x\n", vid, pid);
-	if (vid != 0x4cc || pid != 0x1504) {
-		pr_err("No ISP1504 found\n");
+	if (ulpi_init(view))
 		return -1;
-	}
 
 	if (on) {
 		ret = ulpi_set(DRV_VBUS_EXT |       /* enable external Vbus */
diff --git a/drivers/usb/otg/ulpi.c b/drivers/usb/otg/ulpi.c
index 575ed94..ad13b4b 100644
--- a/drivers/usb/otg/ulpi.c
+++ b/drivers/usb/otg/ulpi.c
@@ -116,3 +116,48 @@ int ulpi_clear(u8 bits, int reg, void __iomem *view)
 }
 EXPORT_SYMBOL(ulpi_clear);
 
+struct ulpi_info {
+	uint32_t	id;
+	char		*name;
+};
+
+#define ULPI_ID(vendor, product) (((vendor) << 16) | (product))
+#define ULPI_INFO(_id, _name)		\
+	{				\
+		.id	= (_id),	\
+		.name	= (_name),	\
+	}
+
+/* ULPI hardcoded IDs, used for probing */
+static struct ulpi_info ulpi_ids[] = {
+	ULPI_INFO(ULPI_ID(0x04cc, 0x1504), "NXP ISP1504"),
+	ULPI_INFO(ULPI_ID(0x0424, 0x0006), "SMSC USB331x"),
+};
+
+int ulpi_init(void __iomem *view)
+{
+	int i, vid, pid, ret;
+	uint32_t ulpi_id = 0;
+
+	for (i = 0; i < 4; i++) {
+		ret = ulpi_read(ULPI_PID_HIGH - i, view);
+		if (ret < 0)
+			return ret;
+		ulpi_id = (ulpi_id << 8) | ret;
+	}
+	vid = ulpi_id & 0xffff;
+	pid = ulpi_id >> 16;
+
+	for (i = 0; i < ARRAY_SIZE(ulpi_ids); i++) {
+		if (ulpi_ids[i].id == ULPI_ID(vid, pid)) {
+			pr_info("Found %s ULPI transceiver (0x%04x:0x%04x).\n",
+			ulpi_ids[i].name, vid, pid);
+			return 0;
+		}
+	}
+
+	pr_err("No ULPI found.\n");
+
+	return -1;
+}
+EXPORT_SYMBOL(ulpi_init);
diff --git a/include/usb/ulpi.h b/include/usb/ulpi.h
index 9eed6a4..d841a98 100644
--- a/include/usb/ulpi.h
+++ b/include/usb/ulpi.h
@@ -4,6 +4,7 @@
 int ulpi_set(u8 bits, int reg, void __iomem *view);
 int ulpi_clear(u8 bits, int reg, void __iomem *view);
 int ulpi_read(int reg, void __iomem *view);
+int ulpi_init(void __iomem *view);
 
 /* ULPI register addresses */
 #define ULPI_VID_LOW		0x00	/* Vendor ID low */
-- 
1.7.3.4


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

  reply	other threads:[~2012-03-24 14:00 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-24 14:00 [PATCH 1/6] Rename definitions for ULPI registers Alexander Shiyan
2012-03-24 14:00 ` Alexander Shiyan [this message]
2012-03-24 14:00 ` [PATCH 3/6] Move set_vbus_power code to ULPI driver Alexander Shiyan
2012-03-24 14:00 ` [PATCH 4/6] Rename function ulpi_init to ulpi_detect Alexander Shiyan
2012-03-24 14:00 ` [PATCH 5/6] Completely migrate option ISP1504 to ULPI Alexander Shiyan
2012-03-24 14:00 ` [PATCH 6/6] Cosmetic change name ISP1504 -> ISP150x Alexander Shiyan
2012-04-02  7:35 ` [PATCH 1/6] Rename definitions for ULPI registers 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=1332597640-31268-2-git-send-email-shc_work@mail.ru \
    --to=shc_work@mail.ru \
    --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