From: Paul Walmsley <paul@pwsan.com>
To: linux-arm-kernel@lists.arm.linux.org.uk, linux-kernel@vger.kernel.org
Cc: linux-omap@vger.kernel.org, Paul Walmsley <paul@pwsan.com>,
Tony Lindgren <tony@atomide.com>,
Eero Nurkkala <ext-eero.nurkkala@nokia.com>,
Tony Lindgren <tony@atomide.com>
Subject: [PATCH F 12/12] OMAP2/3 McBSP: add temporary clockdomain fix for McBSP virtual clocks
Date: Wed, 28 Jan 2009 12:35:33 -0700 [thread overview]
Message-ID: <20090128193531.2396.91172.stgit@localhost.localdomain> (raw)
In-Reply-To: <20090128193326.2396.9437.stgit@localhost.localdomain>
The McBSP driver uses virtual clocks to handle enabling and disabling
its hardware clocks. These virtual clocks have no associated
clockdomain. After commit 60b8b431e47d8c5b8c02a2e4fa9af388aae20790,
this prevents the McBSP clocks from registering correctly.
Resolve this for the short term by using virt_opp_clkdm for these clocks.
These McBSP virtual clocks should be removed, but such a fix would require
significant changes to the McBSP drivers that would require testing on
OMAP1, 2, and 3 platforms.
Tested on 2430SDP and 3430SDP GP ES2.1.
linux-omap source commit is 818862e11bad091dc635baedace58265a126b5c8.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Eero Nurkkala <ext-eero.nurkkala@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/clockdomains.h | 2 +-
arch/arm/mach-omap2/mcbsp.c | 5 +++++
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/clockdomains.h b/arch/arm/mach-omap2/clockdomains.h
index 3d4eaca..b29035e 100644
--- a/arch/arm/mach-omap2/clockdomains.h
+++ b/arch/arm/mach-omap2/clockdomains.h
@@ -40,7 +40,7 @@ static struct clockdomain cm_clkdm = {
static struct clockdomain virt_opp_clkdm = {
.name = "virt_opp_clkdm",
.pwrdm = { .name = "wkup_pwrdm" },
- .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX),
+ .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX | CHIP_IS_OMAP3430),
};
/*
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
index e20023c..1785d7a 100644
--- a/arch/arm/mach-omap2/mcbsp.c
+++ b/arch/arm/mach-omap2/mcbsp.c
@@ -79,6 +79,7 @@ static struct mcbsp_internal_clk omap_mcbsp_clks[] = {
.clk = {
.name = "mcbsp_clk",
.id = 1,
+ .clkdm = { .name = "virt_opp_clkdm" },
.enable = omap_mcbsp_clk_enable,
.disable = omap_mcbsp_clk_disable,
},
@@ -87,6 +88,7 @@ static struct mcbsp_internal_clk omap_mcbsp_clks[] = {
.clk = {
.name = "mcbsp_clk",
.id = 2,
+ .clkdm = { .name = "virt_opp_clkdm" },
.enable = omap_mcbsp_clk_enable,
.disable = omap_mcbsp_clk_disable,
},
@@ -95,6 +97,7 @@ static struct mcbsp_internal_clk omap_mcbsp_clks[] = {
.clk = {
.name = "mcbsp_clk",
.id = 3,
+ .clkdm = { .name = "virt_opp_clkdm" },
.enable = omap_mcbsp_clk_enable,
.disable = omap_mcbsp_clk_disable,
},
@@ -103,6 +106,7 @@ static struct mcbsp_internal_clk omap_mcbsp_clks[] = {
.clk = {
.name = "mcbsp_clk",
.id = 4,
+ .clkdm = { .name = "virt_opp_clkdm" },
.enable = omap_mcbsp_clk_enable,
.disable = omap_mcbsp_clk_disable,
},
@@ -111,6 +115,7 @@ static struct mcbsp_internal_clk omap_mcbsp_clks[] = {
.clk = {
.name = "mcbsp_clk",
.id = 5,
+ .clkdm = { .name = "virt_opp_clkdm" },
.enable = omap_mcbsp_clk_enable,
.disable = omap_mcbsp_clk_disable,
},
next prev parent reply other threads:[~2009-01-28 20:50 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-28 19:34 [PATCH F 00/12] OMAP clock, F of F: more clock cleanup Paul Walmsley
2009-01-28 19:35 ` [PATCH F 01/12] OMAP2/3 clock: don't use a barrier after clk_disable() Paul Walmsley
2009-01-28 19:35 ` [PATCH F 02/12] OMAP2xxx clock: consolidate DELAYED_APP clock commits; fix barrier Paul Walmsley
2009-01-28 19:35 ` [PATCH F 03/12] OMAP2/3 clock: convert remaining MPU barriers into OCP barriers Paul Walmsley
2009-01-28 19:35 ` [PATCH F 04/12] OMAP clock: drop clk_get_usecount() Paul Walmsley
2009-01-28 19:35 ` [PATCH F 05/12] OMAP clock: add OMAP chip family-specific clk_register() option Paul Walmsley
2009-01-28 19:35 ` [PATCH F 06/12] OMAP2/3 clock: every clock must have a clkdm Paul Walmsley
2009-01-31 14:08 ` Russell King - ARM Linux
2009-02-03 9:27 ` Paul Walmsley
2009-02-03 14:20 ` Woodruff, Richard
2009-02-05 9:03 ` Paul Walmsley
2009-01-28 19:35 ` [PATCH F 07/12] OMAP2/3 clock: omap2_clk_enable(): refactor usecount check Paul Walmsley
2009-01-28 19:35 ` [PATCH F 08/12] OMAP2/3 clock: omap2_clk_enable(): fix bugs in clockdomain handling Paul Walmsley
2009-01-28 19:35 ` [PATCH F 09/12] OMAP2/3 clock: omap2_clk_enable(): fix usecount decrement bug Paul Walmsley
2009-01-28 19:35 ` [PATCH F 10/12] OMAP2/3 clock: omap2_clk_enable(): fix logic Paul Walmsley
2009-01-31 10:58 ` Russell King - ARM Linux
2009-02-02 8:01 ` Paul Walmsley
2009-01-28 19:35 ` [PATCH F 11/12] OMAP2/3 clock: don't tinker with hardirqs when they are supposed to be disabled Paul Walmsley
2009-01-28 19:35 ` Paul Walmsley [this message]
2009-01-31 11:42 ` [PATCH F 12/12] OMAP2/3 McBSP: add temporary clockdomain fix for McBSP virtual clocks Russell King - ARM Linux
2009-02-02 8:09 ` Paul Walmsley
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=20090128193531.2396.91172.stgit@localhost.localdomain \
--to=paul@pwsan.com \
--cc=ext-eero.nurkkala@nokia.com \
--cc=linux-arm-kernel@lists.arm.linux.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--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