All of lore.kernel.org
 help / color / mirror / Atom feed
From: Roger Quadros <rogerq-l0cyMroinI0@public.gmane.org>
To: balbi-l0cyMroinI0@public.gmane.org
Cc: keshava_mgowda-l0cyMroinI0@public.gmane.org,
	rogerq-l0cyMroinI0@public.gmane.org,
	linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [PATCH v2 09/22] mfd: omap-usb-tll: Add OMAP5 revision and HSIC support
Date: Wed, 28 Nov 2012 16:48:57 +0200	[thread overview]
Message-ID: <1354114150-11941-10-git-send-email-rogerq@ti.com> (raw)
In-Reply-To: <1354114150-11941-1-git-send-email-rogerq-l0cyMroinI0@public.gmane.org>

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-l0cyMroinI0@public.gmane.org>
---
 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 f901def..8b6050f 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)
 
@@ -242,6 +246,7 @@ static int __devinit 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:
@@ -310,6 +315,15 @@ static int __devinit 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

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2012-11-28 14:48 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-28 14:48 [PATCH v2 00/22] OMAP USB Host cleanup Roger Quadros
2012-11-28 14:48 ` [PATCH v2 01/22] mfd: omap-usb-tll: Avoid creating copy of platform data Roger Quadros
2012-11-28 14:48 ` [PATCH v2 02/22] mfd: omap-usb-tll: Fix channel count detection Roger Quadros
2012-11-28 14:48 ` [PATCH v2 03/22] mfd: omap-usb-tll: Use devm_kzalloc/ioremap and clean up error path Roger Quadros
2012-11-28 14:48 ` [PATCH v2 04/22] mfd: omap-usb-tll: Clean up clock handling Roger Quadros
2012-11-28 14:48 ` [PATCH v2 07/22] mfd: omap-usb-tll: Fix error message Roger Quadros
     [not found] ` <1354114150-11941-1-git-send-email-rogerq-l0cyMroinI0@public.gmane.org>
2012-11-28 14:48   ` [PATCH v2 05/22] mfd: omap-usb-tll: introduce and use mode_needs_tll() Roger Quadros
2012-11-28 14:48   ` [PATCH v2 06/22] mfd: omap-usb-tll: Check for missing platform data in probe Roger Quadros
2012-11-28 14:48   ` [PATCH v2 08/22] mfd: omap-usb-tll: serialize access to TLL device Roger Quadros
2012-11-28 14:48   ` Roger Quadros [this message]
2012-11-28 14:48   ` [PATCH v2 10/22] mfd: omap_usb_host: Avoid creating copy of platform_data Roger Quadros
2012-11-28 14:48   ` [PATCH v2 11/22] mfd: omap-usb-host: Use devm_kzalloc() and devm_request_and_ioremap() Roger Quadros
2012-11-28 14:49   ` [PATCH v2 15/22] ARM: OMAP2+: clock data: Merge utmi_px_gfclk into usb_host_hs_utmi_px_clk Roger Quadros
2012-11-28 14:49   ` [PATCH v2 18/22] mfd: omap-usb-host: get rid of cpu_is_omap..() macros Roger Quadros
     [not found]     ` <1354114150-11941-19-git-send-email-rogerq-l0cyMroinI0@public.gmane.org>
2012-11-28 16:36       ` Tony Lindgren
2012-11-28 16:49         ` Roger Quadros
2012-11-28 14:49 ` [PATCH v2 12/22] mfd: omap-usb-host: know about number of ports from revision register Roger Quadros
2012-11-28 14:49 ` [PATCH v2 13/22] mfd: omap-usb-host: override number of ports from platform data Roger Quadros
2012-11-28 16:33   ` Tony Lindgren
     [not found]   ` <1354114150-11941-14-git-send-email-rogerq-l0cyMroinI0@public.gmane.org>
2012-12-02 17:14     ` Sergei Shtylyov
     [not found]       ` <50BB8C73.7060008-Igf4POYTYCDQT0dZR+AlfA@public.gmane.org>
2012-12-03 15:58         ` Roger Quadros
2012-12-04 12:32           ` Sergei Shtylyov
2012-11-28 14:49 ` [PATCH v2 14/22] mfd: omap-usb-host: cleanup clock management code Roger Quadros
2012-11-28 14:49 ` [PATCH v2 16/22] mfd: omap-usb-host: Manage HSIC clocks for HSIC mode Roger Quadros
2012-11-28 14:49 ` [PATCH v2 17/22] mfd: omap-usb-host: Get rid of unnecessary spinlock Roger Quadros
2012-11-28 14:49 ` [PATCH v2 19/22] mfd: omap-usb-host: clean up omap_usbhs_init() Roger Quadros
2012-11-28 14:49 ` [PATCH v2 20/22] USB: ehci-omap: Don't free gpios that we didn't request Roger Quadros
2012-11-28 14:49 ` [PATCH v2 21/22] ARM: OMAP2+: clock data: get rid of unused USB host clock aliases Roger Quadros
     [not found]   ` <1354114150-11941-22-git-send-email-rogerq-l0cyMroinI0@public.gmane.org>
2012-11-29 11:24     ` Paul Walmsley
2012-11-28 14:49 ` [PATCH v2 22/22] mfd: omap-usb-host: Don't spam console on clk_set_parent failure Roger Quadros
2012-12-02 17:10   ` Sergei Shtylyov
2012-12-03  7:48     ` Bjørn Mork
     [not found]       ` <87ehj7y3s2.fsf-lbf33ChDnrE/G1V5fR+Y7Q@public.gmane.org>
2012-12-03 15:50         ` Roger Quadros
2012-12-03 15:48     ` Roger Quadros

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=1354114150-11941-10-git-send-email-rogerq@ti.com \
    --to=rogerq-l0cymroini0@public.gmane.org \
    --cc=balbi-l0cyMroinI0@public.gmane.org \
    --cc=keshava_mgowda-l0cyMroinI0@public.gmane.org \
    --cc=linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.