From: Roger Quadros <rogerq@ti.com>
To: <balbi@ti.com>, <sameo@linux.intel.com>, <tony@atomide.com>
Cc: <kishon@ti.com>, <sshtylyov@mvista.com>, <bjorn@mork.no>,
<linux@arm.linux.org.uk>, <linux-usb@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>, <rogerq@ti.com>
Subject: [PATCH v7 09/22] mfd: omap-usb-tll: Add OMAP5 revision and HSIC support
Date: Thu, 17 Jan 2013 13:30:18 +0200 [thread overview]
Message-ID: <1358422231-24736-10-git-send-email-rogerq@ti.com> (raw)
In-Reply-To: <1358422231-24736-1-git-send-email-rogerq@ti.com>
The TLL module on OMAP5 has 3 channels.
HSIC mode requires the TLL channel to be in Transparent UTMI mode.
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
drivers/mfd/omap-usb-tll.c | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/drivers/mfd/omap-usb-tll.c b/drivers/mfd/omap-usb-tll.c
index 9f9cfc2..fc0ac9f 100644
--- a/drivers/mfd/omap-usb-tll.c
+++ b/drivers/mfd/omap-usb-tll.c
@@ -54,10 +54,13 @@
#define OMAP_TLL_CHANNEL_CONF(num) (0x040 + 0x004 * num)
#define OMAP_TLL_CHANNEL_CONF_FSLSMODE_SHIFT 24
+#define OMAP_TLL_CHANNEL_CONF_DRVVBUS (1 << 16)
+#define OMAP_TLL_CHANNEL_CONF_CHRGVBUS (1 << 15)
#define OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF (1 << 11)
#define OMAP_TLL_CHANNEL_CONF_ULPI_ULPIAUTOIDLE (1 << 10)
#define OMAP_TLL_CHANNEL_CONF_UTMIAUTOIDLE (1 << 9)
#define OMAP_TLL_CHANNEL_CONF_ULPIDDRMODE (1 << 8)
+#define OMAP_TLL_CHANNEL_CONF_MODE_TRANSPARENT_UTMI (2 << 1)
#define OMAP_TLL_CHANNEL_CONF_CHANMODE_FSLS (1 << 1)
#define OMAP_TLL_CHANNEL_CONF_CHANEN (1 << 0)
@@ -92,6 +95,7 @@
#define OMAP_USBTLL_REV1 0x00000015 /* OMAP3 */
#define OMAP_USBTLL_REV2 0x00000018 /* OMAP 3630 */
#define OMAP_USBTLL_REV3 0x00000004 /* OMAP4 */
+#define OMAP_USBTLL_REV4 0x00000006 /* OMAP5 */
#define is_ehci_tll_mode(x) (x == OMAP_EHCI_PORT_MODE_TLL)
@@ -245,6 +249,7 @@ static int usbtll_omap_probe(struct platform_device *pdev)
ver = usbtll_read(base, OMAP_USBTLL_REVISION);
switch (ver) {
case OMAP_USBTLL_REV1:
+ case OMAP_USBTLL_REV4:
tll->nch = OMAP_TLL_CHANNEL_COUNT;
break;
case OMAP_USBTLL_REV2:
@@ -313,6 +318,15 @@ static int usbtll_omap_probe(struct platform_device *pdev)
reg &= ~(OMAP_TLL_CHANNEL_CONF_UTMIAUTOIDLE
| OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF
| OMAP_TLL_CHANNEL_CONF_ULPIDDRMODE);
+ } else if (pdata->port_mode[i] ==
+ OMAP_EHCI_PORT_MODE_HSIC) {
+ /*
+ * HSIC Mode requires UTMI port configurations
+ */
+ reg |= OMAP_TLL_CHANNEL_CONF_DRVVBUS
+ | OMAP_TLL_CHANNEL_CONF_CHRGVBUS
+ | OMAP_TLL_CHANNEL_CONF_MODE_TRANSPARENT_UTMI
+ | OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF;
} else {
continue;
}
--
1.7.4.1
next prev parent reply other threads:[~2013-01-17 11:31 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-17 11:30 [PATCH v7 00/22] OMAP USB Host cleanup Roger Quadros
2013-01-17 11:30 ` [PATCH v7 01/22] mfd: omap-usb-host: Consolidate OMAP USB-HS platform data Roger Quadros
2013-01-17 15:16 ` Alan Stern
2013-01-17 16:59 ` Tony Lindgren
2013-01-18 9:45 ` Roger Quadros
2013-02-11 6:46 ` Olof Johansson
2013-02-11 7:58 ` Roger Quadros
2013-02-11 19:02 ` Tony Lindgren
2013-01-17 11:30 ` [PATCH v7 02/22] mfd: omap-usb-tll: Fix channel count detection Roger Quadros
2013-01-17 11:30 ` [PATCH v7 03/22] mfd: omap-usb-tll: Use devm_kzalloc/ioremap and clean up error path Roger Quadros
2013-01-17 11:30 ` [PATCH v7 04/22] mfd: omap-usb-tll: Clean up clock handling Roger Quadros
2013-01-17 11:30 ` [PATCH v7 05/22] mfd: omap-usb-tll: introduce and use mode_needs_tll() Roger Quadros
2013-01-17 11:30 ` [PATCH v7 06/22] mfd: omap-usb-tll: Check for missing platform data in probe Roger Quadros
2013-01-17 11:30 ` [PATCH v7 07/22] mfd: omap-usb-tll: Fix error message Roger Quadros
2013-01-17 11:30 ` [PATCH v7 08/22] mfd: omap-usb-tll: serialize access to TLL device Roger Quadros
2013-01-17 11:30 ` Roger Quadros [this message]
2013-01-17 11:30 ` [PATCH v7 10/22] mfd: omap_usb_host: Avoid missing platform data checks in suspend/resume Roger Quadros
2013-01-17 11:30 ` [PATCH v7 11/22] mfd: omap-usb-host: Use devm_kzalloc() and devm_request_and_ioremap() Roger Quadros
2013-01-17 11:30 ` [PATCH v7 12/22] mfd: omap-usb-host: know about number of ports from revision register Roger Quadros
2013-01-17 11:30 ` [PATCH v7 13/22] mfd: omap-usb-host: override number of ports from platform data Roger Quadros
2013-01-17 11:30 ` [PATCH v7 14/22] mfd: omap-usb-host: cleanup clock management code Roger Quadros
2013-01-17 11:44 ` Felipe Balbi
2013-01-17 12:07 ` Roger Quadros
2013-01-17 11:30 ` [PATCH v7 15/22] mfd: omap-usb-host: Manage HSIC clocks for HSIC mode Roger Quadros
2013-01-17 11:45 ` Felipe Balbi
2013-01-17 12:10 ` Roger Quadros
2013-01-17 12:27 ` Felipe Balbi
2013-01-17 12:45 ` Roger Quadros
2013-01-17 12:48 ` Felipe Balbi
2013-01-17 11:30 ` [PATCH v7 16/22] mfd: omap-usb-host: Get rid of unnecessary spinlock Roger Quadros
2013-01-17 11:30 ` [PATCH v7 17/22] mfd: omap-usb-host: clean up omap_usbhs_init() Roger Quadros
2013-01-17 11:48 ` Felipe Balbi
2013-01-17 12:13 ` Roger Quadros
2013-01-17 11:30 ` [PATCH v7 18/22] USB: ehci-omap: Don't free gpios that we didn't request Roger Quadros
2013-01-17 11:48 ` Felipe Balbi
2013-01-17 12:46 ` Roger Quadros
2013-01-17 15:15 ` Alan Stern
2013-01-17 11:30 ` [PATCH v7 19/22] ARM: OMAP3: clock data: get rid of unused USB host clock aliases and dummies Roger Quadros
2013-01-17 17:03 ` Tony Lindgren
2013-01-17 19:00 ` Paul Walmsley
2013-01-17 21:00 ` Felipe Balbi
2013-01-17 22:29 ` Paul Walmsley
2013-01-17 22:31 ` Tony Lindgren
2013-01-17 22:38 ` Paul Walmsley
2013-01-17 22:32 ` Felipe Balbi
2013-01-17 11:30 ` [PATCH v7 20/22] ARM: OMAP4: clock data: get rid of unused USB host clock aliases Roger Quadros
2013-01-17 11:30 ` [PATCH v7 21/22] mfd: omap-usb-host: Don't spam console on clk_set_parent failure Roger Quadros
2013-01-17 11:30 ` [PATCH v7 22/22] mdf: omap-usb-host: get rid of build warning Roger Quadros
2013-01-17 11:50 ` Felipe Balbi
2013-01-17 13:30 ` Roger Quadros
2013-01-17 11:52 ` [PATCH v7 00/22] OMAP USB Host cleanup Felipe Balbi
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=1358422231-24736-10-git-send-email-rogerq@ti.com \
--to=rogerq@ti.com \
--cc=balbi@ti.com \
--cc=bjorn@mork.no \
--cc=kishon@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=sameo@linux.intel.com \
--cc=sshtylyov@mvista.com \
--cc=tony@atomide.com \
/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
all inboxes | Powered by JetHome®