Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 137335
b: refs/heads/master
c: b8168d1
h: refs/heads/master
i:
  137333: 8d50700
  137331: ce2ec4d
  137327: 7895cd7
v: v3
  • Loading branch information
Paul Walmsley authored and Russell King committed Feb 8, 2009
1 parent 039801d commit 97133d6
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f0587b63c24e0c7539c6e77f1bfc68e6053608c7
refs/heads/master: b8168d1e3989bc141da6bba87ad49e218ff04658
20 changes: 16 additions & 4 deletions trunk/arch/arm/mach-omap2/clock34xx.h
Original file line number Diff line number Diff line change
Expand Up @@ -1060,8 +1060,15 @@ static struct clk corex2_fck = {

/* DPLL power domain clock controls */

static const struct clksel div2_core_clksel[] = {
{ .parent = &core_ck, .rates = div2_rates },
static const struct clksel_rate div4_rates[] = {
{ .div = 1, .val = 1, .flags = RATE_IN_343X | DEFAULT_RATE },
{ .div = 2, .val = 2, .flags = RATE_IN_343X },
{ .div = 4, .val = 4, .flags = RATE_IN_343X },
{ .div = 0 }
};

static const struct clksel div4_core_clksel[] = {
{ .parent = &core_ck, .rates = div4_rates },
{ .parent = NULL }
};

Expand All @@ -1076,7 +1083,7 @@ static struct clk dpll1_fck = {
.init = &omap2_init_clksel_parent,
.clksel_reg = OMAP_CM_REGADDR(MPU_MOD, OMAP3430_CM_CLKSEL1_PLL),
.clksel_mask = OMAP3430_MPU_CLK_SRC_MASK,
.clksel = div2_core_clksel,
.clksel = div4_core_clksel,
.flags = RATE_PROPAGATES,
.recalc = &omap2_clksel_recalc,
};
Expand Down Expand Up @@ -1151,7 +1158,7 @@ static struct clk dpll2_fck = {
.init = &omap2_init_clksel_parent,
.clksel_reg = OMAP_CM_REGADDR(OMAP3430_IVA2_MOD, OMAP3430_CM_CLKSEL1_PLL),
.clksel_mask = OMAP3430_IVA2_CLK_SRC_MASK,
.clksel = div2_core_clksel,
.clksel = div4_core_clksel,
.flags = RATE_PROPAGATES,
.recalc = &omap2_clksel_recalc,
};
Expand Down Expand Up @@ -1187,6 +1194,11 @@ static struct clk iva2_ck = {

/* Common interface clocks */

static const struct clksel div2_core_clksel[] = {
{ .parent = &core_ck, .rates = div2_rates },
{ .parent = NULL }
};

static struct clk l3_ick = {
.name = "l3_ick",
.ops = &clkops_null,
Expand Down

0 comments on commit 97133d6

Please sign in to comment.