diff options
author | Rajendra Nayak <rnayak@ti.com> | 2012-11-06 17:41:08 -0500 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2012-11-12 21:10:20 -0500 |
commit | cb26867ee24a7e32ab72ec28e43456c7571c059a (patch) | |
tree | aaa2d1e32d51014b2a5b7ed32602be8f5178b490 /arch/arm/mach-omap2/clock44xx_data.c | |
parent | 8c725dcd2246e8500a6fdd394ef4cb0cf96f2217 (diff) |
ARM: OMAP4: clock: Add 44xx data using common struct clk
This patch is output from updated omap hw data autogeneration scripts
mostly contributed by Mike Turquette, with some later fixes from me.
All data is added into a new cclock44xx_data.c file which will be
switched with clock44xx_data.c file in a later patch.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
[paul@pwsan.com: replace omap2_init_clksel_parent() with
omap2_clksel_find_parent_index(); reflowed macros; updated
DEFINE_STRUCT_CLK_HW_OMAP macro to include clkdm_name;
use macros for clksel mux+gate clocks; many other fixes]
[mturquette@ti.com: converted DPLL outputs to HSDIVIDER macro; trace_clk_div_ck
has clkdm ops]
Signed-off-by: Mike Turquette <mturquette@ti.com>
[paul@pwsan.com: fixed the omap-gpmc.fck alias per commit a2e5b90b; fixed
several checkpatch issues; moved the dpll3xxx.c clockdomain modifications to
another patch]
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/clock44xx_data.c')
-rw-r--r-- | arch/arm/mach-omap2/clock44xx_data.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c index 2a450c9b9a7b..ef6d09e9a938 100644 --- a/arch/arm/mach-omap2/clock44xx_data.c +++ b/arch/arm/mach-omap2/clock44xx_data.c | |||
@@ -275,13 +275,6 @@ static struct clk abe_24m_fclk = { | |||
275 | .recalc = &omap_fixed_divisor_recalc, | 275 | .recalc = &omap_fixed_divisor_recalc, |
276 | }; | 276 | }; |
277 | 277 | ||
278 | static const struct clksel_rate div3_1to4_rates[] = { | ||
279 | { .div = 1, .val = 0, .flags = RATE_IN_4430 }, | ||
280 | { .div = 2, .val = 1, .flags = RATE_IN_4430 }, | ||
281 | { .div = 4, .val = 2, .flags = RATE_IN_4430 }, | ||
282 | { .div = 0 }, | ||
283 | }; | ||
284 | |||
285 | static const struct clksel abe_clk_div[] = { | 278 | static const struct clksel abe_clk_div[] = { |
286 | { .parent = &dpll_abe_m2x2_ck, .rates = div3_1to4_rates }, | 279 | { .parent = &dpll_abe_m2x2_ck, .rates = div3_1to4_rates }, |
287 | { .parent = NULL }, | 280 | { .parent = NULL }, |
@@ -677,7 +670,6 @@ static struct dpll_data dpll_mpu_dd = { | |||
677 | .min_divider = 1, | 670 | .min_divider = 1, |
678 | }; | 671 | }; |
679 | 672 | ||
680 | |||
681 | static struct clk dpll_mpu_ck = { | 673 | static struct clk dpll_mpu_ck = { |
682 | .name = "dpll_mpu_ck", | 674 | .name = "dpll_mpu_ck", |
683 | .parent = &sys_clkin_ck, | 675 | .parent = &sys_clkin_ck, |