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 05/23] mfd: omap-usb-tll: Clean up clock handling
Date: Mon, 10 Dec 2012 12:20:15 +0200 [thread overview]
Message-ID: <1355134833-5199-6-git-send-email-rogerq@ti.com> (raw)
In-Reply-To: <1355134833-5199-1-git-send-email-rogerq@ti.com>
Every channel has a functional clock that is similarly named.
It makes sense to use a for loop to manage these clocks as OMAPs
can come with up to 3 channels.
Dynamically allocate and get channel clocks depending on the
number of clocks avaiable on the platform.
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
drivers/mfd/omap-usb-tll.c | 93 +++++++++++++++++++++++++++-----------------
1 files changed, 57 insertions(+), 36 deletions(-)
diff --git a/drivers/mfd/omap-usb-tll.c b/drivers/mfd/omap-usb-tll.c
index 828207f..7d0f6cf 100644
--- a/drivers/mfd/omap-usb-tll.c
+++ b/drivers/mfd/omap-usb-tll.c
@@ -96,10 +96,9 @@
#define is_ehci_tll_mode(x) (x == OMAP_EHCI_PORT_MODE_TLL)
struct usbtll_omap {
- struct clk *usbtll_p1_fck;
- struct clk *usbtll_p2_fck;
int nch; /* num. of channels */
struct usbtll_omap_platform_data *pdata;
+ struct clk **ch_clk;
/* secure the register updates */
spinlock_t lock;
};
@@ -225,26 +224,10 @@ static int __devinit usbtll_omap_probe(struct platform_device *pdev)
tll->pdata = pdata;
- tll->usbtll_p1_fck = clk_get(dev, "usb_tll_hs_usb_ch0_clk");
- if (IS_ERR(tll->usbtll_p1_fck)) {
- ret = PTR_ERR(tll->usbtll_p1_fck);
- dev_err(dev, "usbtll_p1_fck failed error:%d\n", ret);
- return ret;
- }
-
- tll->usbtll_p2_fck = clk_get(dev, "usb_tll_hs_usb_ch1_clk");
- if (IS_ERR(tll->usbtll_p2_fck)) {
- ret = PTR_ERR(tll->usbtll_p2_fck);
- dev_err(dev, "usbtll_p2_fck failed error:%d\n", ret);
- goto err_p2_fck;
- }
-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
base = devm_request_and_ioremap(dev, res);
- if (!base) {
- ret = -EADDRNOTAVAIL;
- goto err_res;
- }
+ if (!base)
+ return -EADDRNOTAVAIL;
platform_set_drvdata(pdev, tll);
pm_runtime_enable(dev);
@@ -269,6 +252,32 @@ static int __devinit usbtll_omap_probe(struct platform_device *pdev)
break;
}
+ spin_unlock_irqrestore(&tll->lock, flags);
+
+ tll->ch_clk = devm_kzalloc(dev, sizeof(struct clk * [tll->nch]),
+ GFP_KERNEL);
+ if (!tll->ch_clk) {
+ ret = -ENOMEM;
+ dev_err(dev, "Couldn't allocate memory for channel clocks\n");
+ goto err_clk_alloc;
+ }
+
+ spin_lock_irqsave(&tll->lock, flags);
+
+ for (i = 0; i < tll->nch; i++) {
+ char clkname[] = "usb_tll_hs_usb_chx_clk";
+ struct clk *fck;
+
+ snprintf(clkname, sizeof(clkname),
+ "usb_tll_hs_usb_ch%d_clk", i);
+ fck = clk_get(dev, clkname);
+
+ if (IS_ERR(fck))
+ dev_dbg(dev, "can't get clock : %s\n", clkname);
+ else
+ tll->ch_clk[i] = fck;
+ }
+
if (is_ehci_tll_mode(pdata->port_mode[0]) ||
is_ehci_tll_mode(pdata->port_mode[1]) ||
is_ehci_tll_mode(pdata->port_mode[2]) ||
@@ -320,11 +329,9 @@ static int __devinit usbtll_omap_probe(struct platform_device *pdev)
return 0;
-err_res:
- clk_put(tll->usbtll_p2_fck);
-
-err_p2_fck:
- clk_put(tll->usbtll_p1_fck);
+err_clk_alloc:
+ pm_runtime_put_sync(dev);
+ pm_runtime_disable(dev);
return ret;
}
@@ -338,9 +345,11 @@ err_p2_fck:
static int __devexit usbtll_omap_remove(struct platform_device *pdev)
{
struct usbtll_omap *tll = platform_get_drvdata(pdev);
+ int i;
+
+ for (i = 0; i < tll->nch; i++)
+ clk_put(tll->ch_clk[i]);
- clk_put(tll->usbtll_p2_fck);
- clk_put(tll->usbtll_p1_fck);
pm_runtime_disable(&pdev->dev);
return 0;
}
@@ -350,6 +359,7 @@ static int usbtll_runtime_resume(struct device *dev)
struct usbtll_omap *tll = dev_get_drvdata(dev);
struct usbtll_omap_platform_data *pdata = tll->pdata;
unsigned long flags;
+ int i;
dev_dbg(dev, "usbtll_runtime_resume\n");
@@ -360,11 +370,20 @@ static int usbtll_runtime_resume(struct device *dev)
spin_lock_irqsave(&tll->lock, flags);
- if (is_ehci_tll_mode(pdata->port_mode[0]))
- clk_enable(tll->usbtll_p1_fck);
+ for (i = 0; i < tll->nch; i++) {
+ if (is_ehci_tll_mode(pdata->port_mode[i])) {
+ int r;
- if (is_ehci_tll_mode(pdata->port_mode[1]))
- clk_enable(tll->usbtll_p2_fck);
+ if (!tll->ch_clk[i])
+ continue;
+
+ r = clk_enable(tll->ch_clk[i]);
+ if (r) {
+ dev_err(dev,
+ "Error enabling ch %d clock: %d\n", i, r);
+ }
+ }
+ }
spin_unlock_irqrestore(&tll->lock, flags);
@@ -376,6 +395,7 @@ static int usbtll_runtime_suspend(struct device *dev)
struct usbtll_omap *tll = dev_get_drvdata(dev);
struct usbtll_omap_platform_data *pdata = tll->pdata;
unsigned long flags;
+ int i;
dev_dbg(dev, "usbtll_runtime_suspend\n");
@@ -386,11 +406,12 @@ static int usbtll_runtime_suspend(struct device *dev)
spin_lock_irqsave(&tll->lock, flags);
- if (is_ehci_tll_mode(pdata->port_mode[0]))
- clk_disable(tll->usbtll_p1_fck);
-
- if (is_ehci_tll_mode(pdata->port_mode[1]))
- clk_disable(tll->usbtll_p2_fck);
+ for (i = 0; i < tll->nch; i++) {
+ if (is_ehci_tll_mode(pdata->port_mode[i])) {
+ if (tll->ch_clk[i])
+ clk_disable(tll->ch_clk[i]);
+ }
+ }
spin_unlock_irqrestore(&tll->lock, flags);
--
1.7.4.1
next prev parent reply other threads:[~2012-12-10 10:21 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 ` [PATCH v4 03/23] mfd: omap-usb-tll: Fix channel count detection Roger Quadros
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 ` Roger Quadros [this message]
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-6-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;
as well as URLs for NNTP newsgroup(s).