From: Roger Quadros <rogerq@ti.com>
To: <balbi@ti.com>, <sameo@linux.intel.com>, <tony@atomide.com>
Cc: <paul@pwsan.com>, <keshava_mgowda@ti.com>, <sshtylyov@mvista.com>,
<bjorn@mork.no>, <rogerq@ti.com>, <linux-usb@vger.kernel.org>,
<linux-omap@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH v4 03/23] mfd: omap-usb-tll: Fix channel count detection
Date: Mon, 10 Dec 2012 12:20:13 +0200 [thread overview]
Message-ID: <1355134833-5199-4-git-send-email-rogerq@ti.com> (raw)
In-Reply-To: <1355134833-5199-1-git-send-email-rogerq@ti.com>
Fix channel count detecion for REV2. Also, don't give up
if we don't recognize the IP Revision. We assume the default
number of channels (i.e. 3) for unrecognized IPs.
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
drivers/mfd/omap-usb-tll.c | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/drivers/mfd/omap-usb-tll.c b/drivers/mfd/omap-usb-tll.c
index 18fefdb..e67cafc 100644
--- a/drivers/mfd/omap-usb-tll.c
+++ b/drivers/mfd/omap-usb-tll.c
@@ -98,6 +98,7 @@
struct usbtll_omap {
struct clk *usbtll_p1_fck;
struct clk *usbtll_p2_fck;
+ int nch; /* num. of channels */
struct usbtll_omap_platform_data *pdata;
/* secure the register updates */
spinlock_t lock;
@@ -210,7 +211,7 @@ static int __devinit usbtll_omap_probe(struct platform_device *pdev)
unsigned reg;
unsigned long flags;
int ret = 0;
- int i, ver, count;
+ int i, ver;
dev_dbg(dev, "starting TI HSUSB TLL Controller\n");
@@ -262,16 +263,18 @@ 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_REV2:
- count = OMAP_TLL_CHANNEL_COUNT;
+ tll->nch = OMAP_TLL_CHANNEL_COUNT;
break;
+ case OMAP_USBTLL_REV2:
case OMAP_USBTLL_REV3:
- count = OMAP_REV2_TLL_CHANNEL_COUNT;
+ tll->nch = OMAP_REV2_TLL_CHANNEL_COUNT;
break;
default:
- dev_err(dev, "TLL version failed\n");
- ret = -ENODEV;
- goto err_ioremap;
+ tll->nch = OMAP_TLL_CHANNEL_COUNT;
+ dev_dbg(dev,
+ "USB TLL Rev : 0x%x not recognized, assuming %d channels\n",
+ ver, tll->nch);
+ break;
}
if (is_ehci_tll_mode(pdata->port_mode[0]) ||
@@ -291,7 +294,7 @@ static int __devinit usbtll_omap_probe(struct platform_device *pdev)
usbtll_write(base, OMAP_TLL_SHARED_CONF, reg);
/* Enable channels now */
- for (i = 0; i < count; i++) {
+ for (i = 0; i < tll->nch; i++) {
reg = usbtll_read(base, OMAP_TLL_CHANNEL_CONF(i));
if (is_ohci_port(pdata->port_mode[i])) {
@@ -319,7 +322,6 @@ static int __devinit usbtll_omap_probe(struct platform_device *pdev)
}
}
-err_ioremap:
spin_unlock_irqrestore(&tll->lock, flags);
iounmap(base);
pm_runtime_put_sync(dev);
--
1.7.4.1
next prev parent reply other threads:[~2012-12-10 10:29 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-10 10:20 [PATCH v4 00/23] OMAP USB Host cleanup Roger Quadros
2012-12-10 10:20 ` [PATCH v4 01/23] mfd: omap-usb-host: get rid of cpu_is_omap..() macros Roger Quadros
2012-12-13 21:49 ` Tony Lindgren
2012-12-14 0:54 ` Samuel Ortiz
2012-12-14 18:30 ` Tony Lindgren
2012-12-10 10:20 ` [PATCH v4 02/23] mfd: omap-usb-tll: Avoid creating copy of platform data Roger Quadros
2012-12-10 10:20 ` Roger Quadros [this message]
2012-12-10 10:20 ` [PATCH v4 04/23] mfd: omap-usb-tll: Use devm_kzalloc/ioremap and clean up error path Roger Quadros
2012-12-10 10:20 ` [PATCH v4 05/23] mfd: omap-usb-tll: Clean up clock handling Roger Quadros
2012-12-10 10:20 ` [PATCH v4 06/23] mfd: omap-usb-tll: introduce and use mode_needs_tll() Roger Quadros
2012-12-10 10:20 ` [PATCH v4 07/23] mfd: omap-usb-tll: Check for missing platform data in probe Roger Quadros
2012-12-10 10:20 ` [PATCH v4 08/23] mfd: omap-usb-tll: Fix error message Roger Quadros
2012-12-10 10:20 ` [PATCH v4 09/23] mfd: omap-usb-tll: serialize access to TLL device Roger Quadros
2012-12-10 10:20 ` [PATCH v4 10/23] mfd: omap-usb-tll: Add OMAP5 revision and HSIC support Roger Quadros
2012-12-10 10:20 ` [PATCH v4 11/23] mfd: omap_usb_host: Avoid creating copy of platform_data Roger Quadros
2012-12-10 10:20 ` [PATCH v4 12/23] mfd: omap-usb-host: Use devm_kzalloc() and devm_request_and_ioremap() Roger Quadros
2012-12-10 10:20 ` [PATCH v4 13/23] mfd: omap-usb-host: know about number of ports from revision register Roger Quadros
2012-12-10 10:20 ` [PATCH v4 14/23] mfd: omap-usb-host: override number of ports from platform data Roger Quadros
2012-12-10 10:20 ` [PATCH v4 15/23] mfd: omap-usb-host: cleanup clock management code Roger Quadros
2012-12-10 10:20 ` [PATCH v4 16/23] ARM: OMAP2+: clock data: Merge utmi_px_gfclk into usb_host_hs_utmi_px_clk Roger Quadros
2012-12-14 18:28 ` Tony Lindgren
2012-12-14 18:44 ` Paul Walmsley
2012-12-17 8:13 ` Benoit Cousson
2012-12-17 16:13 ` Roger Quadros
2012-12-17 16:27 ` Benoit Cousson
2012-12-17 21:03 ` Paul Walmsley
2012-12-10 10:20 ` [PATCH v4 17/23] mfd: omap-usb-host: Manage HSIC clocks for HSIC mode Roger Quadros
2012-12-10 10:20 ` [PATCH v4 18/23] mfd: omap-usb-host: Get rid of unnecessary spinlock Roger Quadros
2012-12-10 10:20 ` [PATCH v4 19/23] mfd: omap-usb-host: clean up omap_usbhs_init() Roger Quadros
2012-12-10 10:20 ` [PATCH v4 20/23] USB: ehci-omap: Don't free gpios that we didn't request Roger Quadros
2012-12-10 10:20 ` [PATCH v4 21/23] ARM: OMAP3: clock data: get rid of unused USB host clock aliases and dummies Roger Quadros
2012-12-10 17:24 ` Paul Walmsley
2012-12-10 10:20 ` [PATCH v4 22/23] ARM: OMAP4: clock data: get rid of unused USB host clock aliases Roger Quadros
2012-12-10 17:26 ` Paul Walmsley
2012-12-10 10:20 ` [PATCH v4 23/23] mfd: omap-usb-host: Don't spam console on clk_set_parent failure Roger Quadros
2012-12-10 11:24 ` Rajendra Nayak
2012-12-10 11:31 ` Roger Quadros
2012-12-10 14:38 ` Felipe Balbi
2012-12-13 10:44 ` [PATCH v4 00/23] OMAP USB Host cleanup Roger Quadros
2012-12-13 10:40 ` 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=1355134833-5199-4-git-send-email-rogerq@ti.com \
--to=rogerq@ti.com \
--cc=balbi@ti.com \
--cc=bjorn@mork.no \
--cc=keshava_mgowda@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=paul@pwsan.com \
--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®