From: John Stultz <john.stultz@linaro.org>
To: LKML <linux-kernel@vger.kernel.org>
Cc: "Arve Hjønnevåg" <arve@android.com>,
"Russell King" <linux@arm.linux.org.uk>,
"Paul Gortmaker" <paul.gortmaker@windriver.com>,
"Alexander Shishkin" <alexander.shishkin@linux.intel.com>,
"John Stultz" <john.stultz@linaro.org>
Subject: [PATCH 01/15] ARM: etm: Don't require clock control
Date: Wed, 20 Jun 2012 18:47:33 -0400 [thread overview]
Message-ID: <1340232467-6023-2-git-send-email-john.stultz@linaro.org> (raw)
In-Reply-To: <1340232467-6023-1-git-send-email-john.stultz@linaro.org>
From: Arve Hjønnevåg <arve@android.com>
If clk_get fail, assume the etb does not need a separate clock.
CC: Russell King <linux@arm.linux.org.uk>
CC: Paul Gortmaker <paul.gortmaker@windriver.com>
CC: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Acked-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Arve Hjønnevåg <arve@android.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
arch/arm/kernel/etm.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/arch/arm/kernel/etm.c b/arch/arm/kernel/etm.c
index 36d20bd..bd295e8 100644
--- a/arch/arm/kernel/etm.c
+++ b/arch/arm/kernel/etm.c
@@ -362,13 +362,12 @@ static int __devinit etb_probe(struct amba_device *dev, const struct amba_id *id
if (ret)
goto out_unmap;
+ /* Get optional clock. Currently used to select clock source on omap3 */
t->emu_clk = clk_get(&dev->dev, "emu_src_ck");
- if (IS_ERR(t->emu_clk)) {
+ if (IS_ERR(t->emu_clk))
dev_dbg(&dev->dev, "Failed to obtain emu_src_ck.\n");
- return -EFAULT;
- }
-
- clk_enable(t->emu_clk);
+ else
+ clk_enable(t->emu_clk);
etb_unlock(t);
t->etb_bufsz = etb_readl(t, ETBR_DEPTH);
@@ -403,8 +402,10 @@ static int etb_remove(struct amba_device *dev)
iounmap(t->etb_regs);
t->etb_regs = NULL;
- clk_disable(t->emu_clk);
- clk_put(t->emu_clk);
+ if (!IS_ERR(t->emu_clk)) {
+ clk_disable(t->emu_clk);
+ clk_put(t->emu_clk);
+ }
amba_release_regions(dev);
--
1.7.9.5
next prev parent reply other threads:[~2012-06-20 22:49 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-20 22:47 [PATCH 00/15] Android ETM driver changes John Stultz
2012-06-20 22:47 ` John Stultz [this message]
2012-06-28 15:47 ` [PATCH 01/15] ARM: etm: Don't require clock control Linus Walleij
2012-06-20 22:47 ` [PATCH 02/15] ARM: etm: Don't limit tracing to only non-secure code John Stultz
2012-06-28 15:49 ` Linus Walleij
2012-06-20 22:47 ` [PATCH 03/15] ARM: etm: Don't try to clear the buffer full status after reading the buffer John Stultz
2012-06-20 22:47 ` [PATCH 04/15] ARM: etm: Allow range selection John Stultz
2012-06-28 15:54 ` Linus Walleij
2012-06-20 22:47 ` [PATCH 05/15] ARM: etm: Configure data tracing John Stultz
2012-06-28 15:55 ` Linus Walleij
2012-06-20 22:47 ` [PATCH 06/15] ARM: etm: Add some missing locks and error checks John Stultz
2012-06-28 15:56 ` Linus Walleij
2012-06-20 22:47 ` [PATCH 07/15] ARM: etm: Return the entire trace buffer if it is empty after reset John Stultz
2012-06-28 15:57 ` Linus Walleij
2012-06-20 22:47 ` [PATCH 08/15] ARM: etm: Support multiple ETMs/PTMs John Stultz
2012-06-28 16:00 ` Linus Walleij
2012-06-20 22:47 ` [PATCH 09/15] ARM: etm: Power down etm(s) when tracing is not enabled John Stultz
2012-06-28 16:01 ` Linus Walleij
2012-06-20 22:47 ` [PATCH 10/15] ARM: etm: Wait for etm/ptm(s) to stop before requesting PowerDown John Stultz
2012-06-28 16:02 ` Linus Walleij
2012-06-20 22:47 ` [PATCH 11/15] ARM: etm: Check arch version and disable data tracing for ptm John Stultz
2012-06-28 16:07 ` Linus Walleij
2012-06-28 21:31 ` Arve Hjønnevåg
2012-06-30 19:34 ` Linus Walleij
2012-06-20 22:47 ` [PATCH 12/15] ARM: etm: Add sysfs entry to enable timestamps if supported John Stultz
2012-06-28 16:08 ` Linus Walleij
2012-06-20 22:47 ` [PATCH 13/15] ARM: etm: Add sysfs entry to set context-id-size John Stultz
2012-06-28 16:10 ` Linus Walleij
2012-06-20 22:47 ` [PATCH 14/15] ARM: etm: Add sysfs entry to disable branch_output flag John Stultz
2012-06-28 16:10 ` Linus Walleij
2012-06-20 22:47 ` [PATCH 15/15] ARM: etm: Add sysfs entry to enable return stack if supported John Stultz
2012-06-28 16:11 ` Linus Walleij
-- strict thread matches above, loose matches on Subject: below --
2012-06-13 2:01 [PATCH 00/15][RFC] Android ETM driver changes John Stultz
2012-06-13 2:01 ` [PATCH 01/15] ARM: etm: Don't require clock control John Stultz
2012-06-13 8:33 ` Paul Mundt
2012-06-13 23:09 ` John Stultz
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=1340232467-6023-2-git-send-email-john.stultz@linaro.org \
--to=john.stultz@linaro.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=arve@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=paul.gortmaker@windriver.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