diff options
| author | Hiroshi DOYU <Hiroshi.DOYU@nokia.com> | 2008-04-01 10:11:22 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2008-05-09 10:25:03 -0700 |
| commit | 31c203d49ca04e042722d764feec0b80c2afb575 (patch) | |
| tree | 0b3e8d4cae9da47384965184db4d0ca9cf9fcbd0 | |
| parent | c3aa044aa3c70a24b606b9265cba305717ac131a (diff) | |
| download | op-kernel-dev-31c203d49ca04e042722d764feec0b80c2afb575.zip op-kernel-dev-31c203d49ca04e042722d764feec0b80c2afb575.tar.gz | |
ARM: OMAP: Add fuctional clock enabler for iva2
Add fuctional clock enabler for iva2
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap2/clock34xx.h | 5 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/cm-regbits-34xx.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h index a728117..3f133a0 100644 --- a/arch/arm/mach-omap2/clock34xx.h +++ b/arch/arm/mach-omap2/clock34xx.h @@ -1046,12 +1046,13 @@ static struct clk iva2_ck = { .name = "iva2_ck", .parent = &dpll2_m2_ck, .init = &omap2_init_clksel_parent, + .enable_reg = OMAP_CM_REGADDR(OMAP3430_IVA2_MOD, CM_FCLKEN), + .enable_bit = OMAP3430_CM_FCLKEN_IVA2_EN_IVA2_SHIFT, .clksel_reg = OMAP_CM_REGADDR(OMAP3430_IVA2_MOD, OMAP3430_CM_IDLEST_PLL), .clksel_mask = OMAP3430_ST_IVA2_CLK_MASK, .clksel = iva2_clksel, - .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES | - PARENT_CONTROLS_CLOCK, + .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES, .recalc = &omap2_clksel_recalc, }; diff --git a/arch/arm/mach-omap2/cm-regbits-34xx.h b/arch/arm/mach-omap2/cm-regbits-34xx.h index 9249129..3c38395 100644 --- a/arch/arm/mach-omap2/cm-regbits-34xx.h +++ b/arch/arm/mach-omap2/cm-regbits-34xx.h @@ -56,6 +56,7 @@ /* CM_FCLKEN_IVA2 */ #define OMAP3430_CM_FCLKEN_IVA2_EN_IVA2 (1 << 0) +#define OMAP3430_CM_FCLKEN_IVA2_EN_IVA2_SHIFT 0 /* CM_CLKEN_PLL_IVA2 */ #define OMAP3430_IVA2_DPLL_RAMPTIME_SHIFT 8 |
