UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: OMAP2+: clock/dpll: convert bypass check to use clk_features 

OMAP2 DPLL code for checking whether DPLL is in bypass mode now uses
clk_features data provided during boot. This avoids the need to use
cpu_is_X type checks runtime, and allows us to eventually move the
clock code under the clock driver.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Reviewed-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
This commit is contained in:
Tero Kristo 2014-07-02 11:47:42 +03:00 committed by Paul Walmsley
parent 5f84aeb6a1
commit 512d91cbd9
3 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
arch/arm/mach-omap2/clkt_dpll.c
View File

@ -184,18 +184,19 @@ static int _dpll_test_mult(int *m, int n, unsigned long *new_rate,
*/ */
static int _omap2_dpll_is_in_bypass(u32 v) static int _omap2_dpll_is_in_bypass(u32 v)
{ {
if (cpu_is_omap24xx()) { u8 mask, val;
if (v == OMAP2XXX_EN_DPLL_LPBYPASS ||
v == OMAP2XXX_EN_DPLL_FRBYPASS) mask = ti_clk_features.dpll_bypass_vals;
return 1;
} else if (cpu_is_omap34xx()) { /*
if (v == OMAP3XXX_EN_DPLL_LPBYPASS || * Each set bit in the mask corresponds to a bypass value equal
v == OMAP3XXX_EN_DPLL_FRBYPASS) * to the bitshift. Go through each set-bit in the mask and
return 1; * compare against the given register value.
} else if (soc_is_am33xx() || cpu_is_omap44xx() || soc_is_am43xx()) { */
if (v == OMAP4XXX_EN_DPLL_LPBYPASS || while (mask) {
v == OMAP4XXX_EN_DPLL_FRBYPASS || val = __ffs(mask);
v == OMAP4XXX_EN_DPLL_MNBYPASS) mask ^= (1 << val);
if (v == val)
return 1; return 1;
} }

17
arch/arm/mach-omap2/clock.c
View File

@ -767,4 +767,21 @@ void __init ti_clk_init_features(void)
ti_clk_features.fint_min = OMAP3PLUS_DPLL_FINT_MIN; ti_clk_features.fint_min = OMAP3PLUS_DPLL_FINT_MIN;
ti_clk_features.fint_max = OMAP3PLUS_DPLL_FINT_MAX; ti_clk_features.fint_max = OMAP3PLUS_DPLL_FINT_MAX;
} }
/* Bypass value setup for DPLLs */
if (cpu_is_omap24xx()) {
ti_clk_features.dpll_bypass_vals |=
(1 << OMAP2XXX_EN_DPLL_LPBYPASS) |
(1 << OMAP2XXX_EN_DPLL_FRBYPASS);
} else if (cpu_is_omap34xx()) {
ti_clk_features.dpll_bypass_vals |=
(1 << OMAP3XXX_EN_DPLL_LPBYPASS) |
(1 << OMAP3XXX_EN_DPLL_FRBYPASS);
} else if (soc_is_am33xx() || cpu_is_omap44xx() || soc_is_am43xx() ||
soc_is_omap54xx() || soc_is_dra7xx()) {
ti_clk_features.dpll_bypass_vals |=
(1 << OMAP4XXX_EN_DPLL_LPBYPASS) |
(1 << OMAP4XXX_EN_DPLL_FRBYPASS) |
(1 << OMAP4XXX_EN_DPLL_MNBYPASS);
}
} }

1
arch/arm/mach-omap2/clock.h
View File

@ -232,6 +232,7 @@ struct ti_clk_features {
long fint_max; long fint_max;
long fint_band1_max; long fint_band1_max;
long fint_band2_min; long fint_band2_min;
u8 dpll_bypass_vals;
}; };
extern struct ti_clk_features ti_clk_features; extern struct ti_clk_features ti_clk_features;