From: zumeng.chen@windriver.com (Zumeng Chen)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/5] ARM: OMAP3EVM: cosmetic fixes for parent clk set
Date: Wed, 20 Jun 2012 17:14:52 +0800 [thread overview]
Message-ID: <1340183693-3195-5-git-send-email-zumeng.chen@windriver.com> (raw)
In-Reply-To: <1340183693-3195-1-git-send-email-zumeng.chen@windriver.com>
Since it's no more sense to set parent for dummy clock,
so we can just ignore it to mute failed message.
Signed-off-by: Jon Hunter <jon-hunter@ti.com>
Signed-off-by: Zumeng Chen <zumeng.chen@gmail.com>
---
arch/arm/plat-omap/clock.c | 4 ++++
drivers/mfd/omap-usb-host.c | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
index 62ec5c4..c7e26e4 100644
--- a/arch/arm/plat-omap/clock.c
+++ b/arch/arm/plat-omap/clock.c
@@ -149,6 +149,10 @@ int clk_set_parent(struct clk *clk, struct clk *parent)
if (!arch_clock || !arch_clock->clk_set_parent)
return ret;
+ /* If the clock is a dummy clock just return */
+ if (clk == &dummy_ck)
+ return 0;
+
spin_lock_irqsave(&clockfw_lock, flags);
if (clk->usecount == 0) {
ret = arch_clock->clk_set_parent(clk, parent);
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 7e96bb2..c9d27c4 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -699,7 +699,7 @@ static int __devinit usbhs_omap_probe(struct platform_device *pdev)
}
if (is_ehci_phy_mode(pdata->port_mode[0])) {
- /* for OMAP3 , the clk set paretn fails */
+ /* for OMAP3 , the clk set parent fails */
ret = clk_set_parent(omap->utmi_p1_fck,
omap->xclk60mhsp1_ck);
if (ret != 0)
--
1.7.5.4
next prev parent reply other threads:[~2012-06-20 9:14 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-20 9:14 [PATCH v3 0/5] ARM OMAP3530evm misc fixes Zumeng Chen
2012-06-20 9:14 ` [PATCH 1/5] ARM: OMAP3EVM: Add NAND flash definition Zumeng Chen
2012-06-20 9:14 ` [PATCH 2/5] ARM: OMAP3EVM: Adding USB internal LDOs board file Zumeng Chen
2012-06-20 9:14 ` [PATCH 3/5] ARM: omap3evm: enable VBUS switch for EHCI tranceiver Zumeng Chen
2012-06-20 12:05 ` Sergei Shtylyov
2012-06-21 1:03 ` Zumeng Chen
2012-07-06 8:41 ` Tony Lindgren
2012-07-08 7:50 ` Zumeng Chen
2012-06-20 9:14 ` Zumeng Chen [this message]
2012-06-20 16:00 ` [PATCH 4/5] ARM: OMAP3EVM: cosmetic fixes for parent clk set Jon Hunter
2012-06-21 1:05 ` Zumeng Chen
2012-07-06 8:38 ` Tony Lindgren
2012-06-20 9:14 ` [PATCH 5/5] ARM: OMAP3530evm: set pendown_state and debounce time for ads7846 Zumeng Chen
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=1340183693-3195-5-git-send-email-zumeng.chen@windriver.com \
--to=zumeng.chen@windriver.com \
--cc=linux-arm-kernel@lists.infradead.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 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).