From: Paul Walmsley <paul@pwsan.com>
To: linux-omap-open-source@linux.omap.com
Subject: [PATCH 11/28] omap2 clock: convert omap2_clksel_get_src_field() to use new clksel struct
Date: Mon, 20 Aug 2007 03:53:58 -0600 [thread overview]
Message-ID: <20070820095531.050494106@pwsan.com> (raw)
In-Reply-To: 20070820095347.933473149@pwsan.com
[-- Attachment #1: convert_get_src_field.patch --]
[-- Type: text/plain, Size: 7524 bytes --]
Convert omap2_clksel_get_src_field() to use new struct clksel and struct
clksel_rate data.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
---
arch/arm/mach-omap2/clock.c | 206 +++++---------------------------------------
1 file changed, 25 insertions(+), 181 deletions(-)
Index: linux-omap/arch/arm/mach-omap2/clock.c
Index: linux-omap/arch/arm/mach-omap2/clock.c
===================================================================
--- linux-omap.orig/arch/arm/mach-omap2/clock.c
+++ linux-omap/arch/arm/mach-omap2/clock.c
@@ -46,38 +46,11 @@
#define EN_APLL_STOPPED 0
#define EN_APLL_LOCKED 3
-/* CM_{CLKSEL2_CORE,CLKSEL_WKUP}.CLKSEL_GPT* options (24XX) */
-#define CLKSEL_GPT_32K 0
-#define CLKSEL_GPT_SYSCLK 1
-#define CLKSEL_GPT_EXTALTCLK 2
-
-/* CM_CLKSEL1_CORE.CLKSEL_DSS1 options (24XX) */
-#define CLKSEL_DSS1_SYSCLK 0
-#define CLKSEL_DSS1_CORECLK_16 0x10
-
-/* CM_CLKSEL1_CORE.CLKSEL_DSS2 options (24XX) */
-#define CLKSEL_DSS2_SYSCLK 0
-#define CLKSEL_DSS2_48MHZ 1
-
/* CM_CLKSEL1_PLL.APLLS_CLKIN options (24XX) */
#define APLLS_CLKIN_19_2MHZ 0
#define APLLS_CLKIN_13MHZ 2
#define APLLS_CLKIN_12MHZ 3
-/* CM_CLKSEL1_PLL.54M_SOURCE options (24XX) */
-#define CLK_54M_SOURCE_APLL 0
-#define CLK_54M_SOURCE_EXTALTCLK 1
-
-/* CM_CLKSEL1_PLL.48M_SOURCE options (24XX) */
-#define CLK_48M_SOURCE_APLL 0
-#define CLK_48M_SOURCE_EXTALTCLK 1
-
-/* PRCM_CLKOUT_CTRL.CLKOUT_SOURCE options (2420) */
-#define CLKOUT_SOURCE_CORE_CLK 0
-#define CLKOUT_SOURCE_SYS_CLK 1
-#define CLKOUT_SOURCE_96M_CLK 2
-#define CLKOUT_SOURCE_54M_CLK 3
-
#define MAX_PLL_LOCK_WAIT 100000
//#define DOWN_VARIABLE_DPLL 1 /* Experimental */
@@ -473,28 +446,6 @@ static void omap2_clksel_recalc(struct c
propagate_rate(clk);
}
-/*
- * Finds best divider value in an array based on the source and target
- * rates. The divider array must be sorted with smallest divider first.
- */
-static inline u32 omap2_divider_from_table(u32 size, u32 *div_array,
- u32 src_rate, u32 tgt_rate)
-{
- int i, test_rate;
-
- if (div_array == NULL)
- return ~1;
-
- for (i = 0; i < size; i++) {
- test_rate = src_rate / *div_array;
- if (test_rate <= tgt_rate)
- return *div_array;
- ++div_array;
- }
-
- return ~0; /* No acceptable divider */
-}
-
/**
* omap2_get_clksel_by_parent - return clksel struct for a given clk & parent
* @clk: OMAP struct clk ptr to inspect
@@ -875,151 +826,44 @@ static int omap2_clk_set_rate(struct clk
return ret;
}
-/* Converts encoded control register address into a full address */
+/*
+ * Converts encoded control register address into a full address
+ * On error, *src_addr will be returned as 0.
+ */
static u32 omap2_clksel_get_src_field(void __iomem **src_addr,
struct clk *src_clk, u32 *field_mask,
struct clk *clk, u32 *parent_div)
{
- u32 val = ~0, mask = 0;
- void __iomem *src_reg_addr = 0;
- u32 reg_offset;
+ const struct clksel *clks;
+ const struct clksel_rate *clkr;
*parent_div = 0;
- reg_offset = clk->src_offset;
+ *src_addr = 0;
- /* Find target control register.*/
- switch (clk->flags & SRC_RATE_SEL_MASK) {
- case CM_CORE_SEL1:
- src_reg_addr = OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL1);
- if (reg_offset == OMAP24XX_CLKSEL_DSS2_SHIFT) {
- mask = OMAP24XX_CLKSEL_DSS2_MASK;
- if (src_clk == &sys_ck)
- val = CLKSEL_DSS2_SYSCLK;
- else if (src_clk == &func_48m_ck)
- val = CLKSEL_DSS2_48MHZ;
- else
- WARN_ON(1); /* unknown src_clk */
- } else if (reg_offset == OMAP24XX_CLKSEL_DSS1_SHIFT) {
- mask = OMAP24XX_CLKSEL_DSS1_MASK;
- if (src_clk == &sys_ck) {
- val = CLKSEL_DSS1_SYSCLK;
- } else if (src_clk == &core_ck) {
- val = CLKSEL_DSS1_CORECLK_16;
- *parent_div = 16;
- } else {
- WARN_ON(1); /* unknown src clk */
- }
- } else if ((reg_offset == OMAP2420_CLKSEL_VLYNQ_SHIFT) &&
- cpu_is_omap2420()) {
- mask = OMAP2420_CLKSEL_VLYNQ_MASK;
- if (src_clk == &func_96m_ck) {
- val = CLKSEL_VLYNQ_96MHZ;
- } else if (src_clk == &core_ck) {
- val = CLKSEL_VLYNQ_CORECLK_16;
- *parent_div = 16;
- } else {
- WARN_ON(1); /* unknown src_clk */
- }
- } else {
- WARN_ON(1); /* unknown reg_offset */
- }
- break;
- case CM_CORE_SEL2:
- WARN_ON(reg_offset < OMAP24XX_CLKSEL_GPT2_SHIFT ||
- reg_offset > OMAP24XX_CLKSEL_GPT12_SHIFT);
- src_reg_addr = OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL2);
- mask = OMAP24XX_CLKSEL_GPT2_MASK;
- mask <<= (reg_offset - OMAP24XX_CLKSEL_GPT2_SHIFT);
- if (src_clk == &func_32k_ck)
- val = CLKSEL_GPT_32K;
- else if (src_clk == &sys_ck)
- val = CLKSEL_GPT_SYSCLK;
- else if (src_clk == &alt_ck)
- val = CLKSEL_GPT_EXTALTCLK;
- else
- WARN_ON(1); /* unknown src_clk */
- break;
- case CM_WKUP_SEL1:
- WARN_ON(reg_offset != 0); /* unknown reg_offset */
- src_reg_addr = OMAP_CM_REGADDR(WKUP_MOD, CM_CLKSEL);
- mask = OMAP24XX_CLKSEL_GPT1_MASK;
- if (src_clk == &func_32k_ck)
- val = CLKSEL_GPT_32K;
- else if (src_clk == &sys_ck)
- val = CLKSEL_GPT_SYSCLK;
- else if (src_clk == &alt_ck)
- val = CLKSEL_GPT_EXTALTCLK;
- else
- WARN_ON(1); /* unknown src_clk */
- break;
- case CM_PLL_SEL1:
- src_reg_addr = OMAP_CM_REGADDR(PLL_MOD, CM_CLKSEL1);
- if (reg_offset == 0x3) {
- mask = OMAP24XX_48M_SOURCE;
- if (src_clk == &apll96_ck)
- val = CLK_48M_SOURCE_APLL;
- else if (src_clk == &alt_ck)
- val = CLK_48M_SOURCE_EXTALTCLK;
- else
- WARN_ON(1); /* unknown src_clk */
- }
- else if (reg_offset == 0x5) {
- mask = OMAP24XX_54M_SOURCE;
- if (src_clk == &apll54_ck)
- val = CLK_54M_SOURCE_APLL;
- else if (src_clk == &alt_ck)
- val = CLK_54M_SOURCE_EXTALTCLK;
- else
- WARN_ON(1); /* unknown src_clk */
- } else {
- WARN_ON(1); /* unknown reg_offset */
- }
- break;
- case CM_PLL_SEL2:
- WARN_ON(reg_offset != 0);
- src_reg_addr = OMAP_CM_REGADDR(PLL_MOD, CM_CLKSEL2);
- mask = OMAP24XX_CORE_CLK_SRC_MASK;
- if (src_clk == &func_32k_ck)
- val = CORE_CLK_SRC_32K;
- else if (src_clk == &dpll_ck)
- val = CORE_CLK_SRC_DPLL_X2;
- else
- WARN_ON(1); /* unknown src_clk */
- break;
- case CM_SYSCLKOUT_SEL1:
- src_reg_addr = OMAP24XX_PRCM_CLKOUT_CTRL;
-
- if (reg_offset == OMAP24XX_CLKOUT_SOURCE_SHIFT) {
- mask = OMAP24XX_CLKOUT_SOURCE_MASK;
- } else if (reg_offset == OMAP2420_CLKOUT2_SOURCE_SHIFT) {
- mask = OMAP2420_CLKOUT2_SOURCE_MASK;
- } else {
- WARN_ON(1); /* unknown reg_offset */
- }
+ clks = omap2_get_clksel_by_parent(clk, src_clk);
+ if (clks == NULL)
+ return 0;
- if (src_clk == &dpll_ck)
- val = 0;
- else if (src_clk == &sys_ck)
- val = 1;
- else if (src_clk == &func_96m_ck)
- val = 2;
- else if (src_clk == &func_54m_ck)
- val = 3;
- else
- WARN_ON(1); /* unknown src_clk */
- break;
+ for (clkr = clks->rates; clkr->div; clkr++) {
+ if (clkr->flags & (cpu_mask | DEFAULT_RATE))
+ break; /* Found the default rate for this platform */
}
- if (val == ~0) /* Catch errors in offset */
- *src_addr = 0;
- else
- *src_addr = src_reg_addr;
+ if (!clkr->div) {
+ printk(KERN_ERR "clock: Could not find default rate for "
+ "clock %s parent %s\n", clk->name,
+ src_clk->parent->name);
+ return 0;
+ }
- WARN_ON(mask == 0);
+ /* Should never happen. Add a clksel mask to the struct clk. */
+ WARN_ON(clk->clksel_mask == 0);
- *field_mask = mask;
+ *field_mask = clk->clksel_mask;
+ *src_addr = clk->clksel_reg;
+ *parent_div = clkr->div;
- return val;
+ return clkr->val;
}
static int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
--
next prev parent reply other threads:[~2007-08-20 9:53 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-20 9:53 [PATCH 00/28] omap2 clock: framework generalization, cleanup Paul Walmsley
2007-08-20 9:53 ` [PATCH 01/28] omap2 clock: dsp_ick parent is dsp_fck, not core_ck Paul Walmsley
2007-08-20 9:53 ` [PATCH 02/28] omap2 clock: generalize initial clock rate setup: recalculate_root_clocks() Paul Walmsley
2007-08-20 9:53 ` [PATCH 03/28] omap2 clock: mark onchip_clks as __initdata Paul Walmsley
2007-08-20 9:53 ` [PATCH 05/28] omap2 clock: rename, add comment to omap2_mpu_recalc() Paul Walmsley
2007-08-20 9:53 ` [PATCH 06/28] omap2 clock: add clksel and clksel_rate data Paul Walmsley
2007-08-20 9:53 ` [PATCH 07/28] omap2 clock: init clksel clock parents to hardware reality at clock init Paul Walmsley
2007-08-20 12:27 ` [PATCH 07/28] omap2 clock: init clksel clock parents to hardwarereality " Woodruff, Richard
2007-08-21 6:49 ` Paul Walmsley
2007-08-20 9:53 ` [PATCH 08/28] omap2 clock: convert omap2_clksel_to_divisor and omap2_divisor_to_clksel to use new clksel struct Paul Walmsley
2007-08-20 9:53 ` [PATCH 09/28] omap2 clock: convert omap2_clksel_round_rate " Paul Walmsley
2007-08-20 9:53 ` [PATCH 10/28] omap2 clock: convert omap2_get_clksel " Paul Walmsley
2007-08-20 9:53 ` Paul Walmsley [this message]
2007-08-20 9:53 ` [PATCH 12/28] omap2 clock: stop using clk->src_offset in omap2_clk_set_rate() Paul Walmsley
2007-08-20 9:54 ` [PATCH 13/28] omap2 clock: stop using clk->src_offset in omap2_clk_set_parent() Paul Walmsley
2007-08-20 9:54 ` [PATCH 14/28] omap2 clock: clean out old code from omap2_clksel_recalc() Paul Walmsley
2007-08-20 9:54 ` [PATCH 15/28] omap2 clock: convert remaining clksel clocks to use omap2_clksel_recalc Paul Walmsley
2007-08-20 9:54 ` [PATCH 16/28] omap2 clock: remove all {src, rate}_offset fields from struct clk Paul Walmsley
2007-08-20 9:54 ` [PATCH 17/28] omap2 clock: use the struct clk round_rate field for clksel rate rounding code Paul Walmsley
2007-08-20 9:54 ` [PATCH 19/28] omap2 clock: drop RATE_CKCTL from all OMAP2 clocks Paul Walmsley
2007-08-20 9:54 ` [PATCH 20/28] omap2 clock: remove *_SEL* clock flags Paul Walmsley
2007-08-20 9:54 ` [PATCH 21/28] omap2 clock: call clock-specific enable/disable functions if present Paul Walmsley
2007-08-20 9:54 ` [PATCH 22/28] omap2 clock: use custom osc_ck enable/disable routines Paul Walmsley
2007-08-20 9:54 ` [PATCH 23/28] omap2 clock: use standard clk->enable/disable for APLLs Paul Walmsley
2007-08-20 9:54 ` [PATCH 24/28] omap2 clock: replace omap2_get_crystal_rate() with clock-specific recalc code Paul Walmsley
2007-08-20 9:54 ` [PATCH 25/28] omap2 clock: Standardize DPLL rate recalculation with struct dpll_data Paul Walmsley
2007-08-20 9:54 ` [PATCH 27/28] omap2 clock: add three missing clocks: gpmc_fck, sdma_{i, f}ck Paul Walmsley
2007-08-20 9:54 ` [PATCH 28/28] omap2 clock: handle (almost) all clock autoidling via the clock framework Paul Walmsley
2007-08-20 12:55 ` [PATCH 28/28] omap2 clock: handle (almost) all clock autoidling viathe " Woodruff, Richard
2007-08-21 7:04 ` Paul Walmsley
2007-08-21 17:29 ` Woodruff, Richard
2007-08-22 9:49 ` Paul Walmsley
2007-08-22 21:25 ` Woodruff, Richard
2007-08-27 7:39 ` Paul Walmsley
2007-08-30 22:21 ` Woodruff, Richard
2007-08-23 9:21 ` [PATCH 28/28] omap2 clock: handle (almost) all clock autoidlingviathe " Tuukka.Tikkanen
2007-08-27 7:56 ` Paul Walmsley
2007-08-27 14:13 ` Tuukka.Tikkanen
2007-08-20 13:18 ` [PATCH 28/28] omap2 clock: handle (almost) all clock autoidling viathe " Woodruff, Richard
2007-08-20 13:30 ` Igor Stoppa
2007-08-20 13:48 ` [PATCH 28/28] omap2 clock: handle (almost) all clockautoidling " Woodruff, Richard
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=20070820095531.050494106@pwsan.com \
--to=paul@pwsan.com \
--cc=linux-omap-open-source@linux.omap.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