From: Paul Walmsley <paul@pwsan.com>
To: linux-omap@vger.kernel.org
Cc: Paul Walmsley <paul@pwsan.com>
Subject: [PATCH v2 16/23] OMAP clock: add OMAP chip family-specific clk_register() option
Date: Sun, 04 Jan 2009 19:34:57 -0700 [thread overview]
Message-ID: <20090105023457.12661.33383.stgit@localhost.localdomain> (raw)
In-Reply-To: <20090105022953.12661.57701.stgit@localhost.localdomain>
Provide a mechanism for OMAP chip family (e.g., OMAP1, 2, 3) clock
code to define a clk_register function via struct clk_functions. This
is currently only used for OMAP2/3, to handle clock->clockdomain
registration.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
---
arch/arm/mach-omap2/clock.c | 6 ++++++
arch/arm/mach-omap2/clock.h | 1 +
arch/arm/mach-omap2/clock24xx.c | 3 +--
arch/arm/mach-omap2/clock34xx.c | 5 ++---
arch/arm/plat-omap/clock.c | 11 ++++++++++-
arch/arm/plat-omap/include/mach/clock.h | 1 +
6 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index 0946a5a..5f54e7e 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -1085,3 +1085,9 @@ void omap2_clk_disable_unused(struct clk *clk)
_omap2_clk_disable(clk);
}
#endif
+
+int omap2_clk_register(struct clk *clk)
+{
+ omap2_init_clk_clkdm(clk);
+ return 0;
+}
diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h
index a026ec9..f4d489f 100644
--- a/arch/arm/mach-omap2/clock.h
+++ b/arch/arm/mach-omap2/clock.h
@@ -37,6 +37,7 @@
#define OMAP3XXX_EN_DPLL_LOCKED 0x7
int omap2_clk_init(void);
+int omap2_clk_register(struct clk *clk);
int omap2_clk_enable(struct clk *clk);
void omap2_clk_disable(struct clk *clk);
long omap2_clk_round_rate(struct clk *clk, unsigned long rate);
diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
index 67974d6..9e311aa 100644
--- a/arch/arm/mach-omap2/clock24xx.c
+++ b/arch/arm/mach-omap2/clock24xx.c
@@ -450,6 +450,7 @@ void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table)
#endif
static struct clk_functions omap2_clk_functions = {
+ .clk_register = omap2_clk_register,
.clk_enable = omap2_clk_enable,
.clk_disable = omap2_clk_disable,
.clk_round_rate = omap2_clk_round_rate,
@@ -578,13 +579,11 @@ int __init omap2_clk_init(void)
if ((*clkp)->flags & CLOCK_IN_OMAP242X && cpu_is_omap2420()) {
clk_register(*clkp);
- omap2_init_clk_clkdm(*clkp);
continue;
}
if ((*clkp)->flags & CLOCK_IN_OMAP243X && cpu_is_omap2430()) {
clk_register(*clkp);
- omap2_init_clk_clkdm(*clkp);
continue;
}
}
diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
index 917664d..824144e 100644
--- a/arch/arm/mach-omap2/clock34xx.c
+++ b/arch/arm/mach-omap2/clock34xx.c
@@ -633,6 +633,7 @@ static void omap3_clkoutx2_recalc(struct clk *clk, unsigned long parent_rate,
#if defined(CONFIG_ARCH_OMAP3)
static struct clk_functions omap2_clk_functions = {
+ .clk_register = omap2_clk_register,
.clk_enable = omap2_clk_enable,
.clk_disable = omap2_clk_disable,
.clk_round_rate = omap2_clk_round_rate,
@@ -729,10 +730,8 @@ int __init omap2_clk_init(void)
for (clkp = onchip_34xx_clks;
clkp < onchip_34xx_clks + ARRAY_SIZE(onchip_34xx_clks);
clkp++) {
- if ((*clkp)->flags & cpu_clkflg) {
+ if ((*clkp)->flags & cpu_clkflg)
clk_register(*clkp);
- omap2_init_clk_clkdm(*clkp);
- }
}
/* REVISIT: Not yet ready for OMAP3 */
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
index 8d43d78..bdf2cd4 100644
--- a/arch/arm/plat-omap/clock.c
+++ b/arch/arm/plat-omap/clock.c
@@ -439,10 +439,17 @@ void recalculate_root_clocks(void)
int clk_register(struct clk *clk)
{
+ int ret;
+
if (clk == NULL || IS_ERR(clk))
return -EINVAL;
mutex_lock(&clocks_mutex);
+ if (arch_clock->clk_register) {
+ ret = arch_clock->clk_register(clk);
+ if (ret)
+ goto cr_out;
+ }
list_add(&clk->node, &clocks);
if (!clk->children.next)
INIT_LIST_HEAD(&clk->children);
@@ -450,9 +457,11 @@ int clk_register(struct clk *clk)
omap_clk_add_child(clk->parent, clk);
if (clk->init)
clk->init(clk);
+ ret = 0;
+cr_out:
mutex_unlock(&clocks_mutex);
- return 0;
+ return ret;
}
EXPORT_SYMBOL(clk_register);
diff --git a/arch/arm/plat-omap/include/mach/clock.h b/arch/arm/plat-omap/include/mach/clock.h
index 2a30268..db57b71 100644
--- a/arch/arm/plat-omap/include/mach/clock.h
+++ b/arch/arm/plat-omap/include/mach/clock.h
@@ -117,6 +117,7 @@ struct clk {
struct cpufreq_frequency_table;
struct clk_functions {
+ int (*clk_register)(struct clk *clk);
int (*clk_enable)(struct clk *clk);
void (*clk_disable)(struct clk *clk);
long (*clk_round_rate)(struct clk *clk, unsigned long rate);
next prev parent reply other threads:[~2009-01-05 3:22 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-05 2:34 [PATCH v2 00/23] OMAP clock: bug fixes, cleanup, optimization Paul Walmsley
2009-01-05 2:34 ` [PATCH v2 01/23] OMAP2/3 clock: use standard set_rate fn in omap2_clk_arch_init() Paul Walmsley
2009-01-05 2:34 ` [PATCH v2 02/23] OMAP clock: move rate recalc, propagation code up to plat-omap/clock.c Paul Walmsley
2009-01-05 2:34 ` [PATCH v2 04/23] OMAP clock: support "dry run" rate and parent changes Paul Walmsley
2009-01-05 2:34 ` [PATCH v2 03/23] OMAP2/3 clock: drop recalc function pointers from fixed rate clocks Paul Walmsley
2009-01-05 2:34 ` [PATCH v2 05/23] OMAP clock: track child clocks Paul Walmsley
2009-01-05 2:34 ` [PATCH v2 06/23] OMAP clock: drop the RATE_PROPAGATES flag Paul Walmsley
2009-01-05 2:34 ` [PATCH v2 07/23] OMAP clock: drop RATE_FIXED Paul Walmsley
2009-01-05 2:34 ` [PATCH v2 09/23] OMAP2 clock: drop CONFIG_PARTICIPANT clock flag Paul Walmsley
2009-01-05 2:34 ` [PATCH v2 08/23] OMAP clock: remove VIRTUAL_CLOCK Paul Walmsley
2009-01-06 2:03 ` Kevin Hilman
2009-01-06 2:34 ` Paul Walmsley
2009-01-05 2:34 ` [PATCH v2 10/23] OMAP2/3 clock: remove clk->owner Paul Walmsley
2009-01-05 2:34 ` [PATCH v2 12/23] OMAP2/3 clock: don't use a barrier after clk_disable() Paul Walmsley
2009-01-05 2:34 ` [PATCH v2 11/23] OMAP clock: rearrange clock.h structure order Paul Walmsley
2009-01-05 2:34 ` [PATCH v2 13/23] OMAP2xxx clock: consolidate DELAYED_APP clock commits; fix barrier Paul Walmsley
2009-01-05 2:34 ` [PATCH v2 14/23] OMAP2/3 clock: convert remaining MPU barriers into OCP barriers Paul Walmsley
2009-01-05 2:34 ` Paul Walmsley [this message]
2009-01-05 2:34 ` [PATCH v2 15/23] OMAP clock: drop clk_get_usecount() Paul Walmsley
2009-01-05 2:34 ` [PATCH v2 17/23] OMAP2/3 clock: every clock must have a clkdm Paul Walmsley
2009-01-05 2:34 ` [PATCH v2 19/23] OMAP2/3 clock: omap2_clk_enable(): fix bugs in clockdomain handling Paul Walmsley
2009-01-05 2:34 ` [PATCH v2 18/23] OMAP2/3 clock: omap2_clk_enable(): refactor usecount check Paul Walmsley
2009-01-05 2:35 ` [PATCH v2 20/23] OMAP2/3 clock: omap2_clk_enable(): fix usecount decrement bug Paul Walmsley
[not found] ` <2ee9e08d0901060342q36a5ebd2i448d87ba55bb034d@mail.gmail.com>
2009-01-06 11:43 ` Fwd: " Anuj Aggarwal
2009-01-05 2:35 ` [PATCH v2 21/23] OMAP2/3 clock: omap2_clk_enable(): fix logic Paul Walmsley
2009-01-05 2:35 ` [PATCH v2 22/23] OMAP2/3 clock: don't tinker with hardirqs when they are supposed to be disabled Paul Walmsley
2009-01-05 2:35 ` [PATCH v2 23/23] OMAP3 SmartReflex: get rid of custom clocks Paul Walmsley
2009-01-07 15:46 ` [PATCH v2 00/23] OMAP clock: bug fixes, cleanup, optimization Tony Lindgren
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=20090105023457.12661.33383.stgit@localhost.localdomain \
--to=paul@pwsan.com \
--cc=linux-omap@vger.kernel.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