Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 184807
b: refs/heads/master
c: 17d0927
h: refs/heads/master
i:
  184805: af70a5d
  184803: 9f4bc79
  184799: d7ea1fc
v: v3
  • Loading branch information
Paul Walmsley committed Feb 24, 2010
1 parent 47f8837 commit b341dc4
Show file tree
Hide file tree
Showing 2 changed files with 4 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: 94297784eec057ca5425d9cd21a845b109fcaebf
refs/heads/master: 17d092733d9ffd7fcf6da36169a60caf8400fc4c
7 changes: 3 additions & 4 deletions trunk/arch/arm/mach-omap2/clock2xxx_data.c
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ static struct clk dsp_ick = {
.name = "dsp_ick", /* apparently ipi and isp */
.ops = &clkops_omap2_dflt_wait,
.parent = &dsp_irate_ick,
.flags = DELAYED_APP | CONFIG_PARTICIPANT,
.flags = CONFIG_PARTICIPANT,
.enable_reg = OMAP_CM_REGADDR(OMAP24XX_DSP_MOD, CM_ICLKEN),
.enable_bit = OMAP2420_EN_DSP_IPI_SHIFT, /* for ipi */
};
Expand All @@ -522,7 +522,7 @@ static struct clk iva2_1_ick = {
.name = "iva2_1_ick",
.ops = &clkops_omap2_dflt_wait,
.parent = &dsp_irate_ick,
.flags = DELAYED_APP | CONFIG_PARTICIPANT,
.flags = CONFIG_PARTICIPANT,
.enable_reg = OMAP_CM_REGADDR(OMAP24XX_DSP_MOD, CM_FCLKEN),
.enable_bit = OMAP24XX_CM_FCLKEN_DSP_EN_DSP_SHIFT,
};
Expand Down Expand Up @@ -779,7 +779,7 @@ static struct clk gfx_ick = {
.name = "gfx_ick", /* From l3 */
.ops = &clkops_omap2_dflt_wait,
.parent = &core_l3_ck,
.flags = DELAYED_APP | CONFIG_PARTICIPANT,
.flags = CONFIG_PARTICIPANT,
.clkdm_name = "gfx_clkdm",
.enable_reg = OMAP_CM_REGADDR(GFX_MOD, CM_ICLKEN),
.enable_bit = OMAP_EN_GFX_SHIFT,
Expand Down Expand Up @@ -2068,7 +2068,6 @@ static struct clk mmchsdb2_fck = {
static struct clk virt_prcm_set = {
.name = "virt_prcm_set",
.ops = &clkops_null,
.flags = DELAYED_APP,
.parent = &mpu_ck, /* Indexed by mpu speed, no parent */
.recalc = &omap2_table_mpu_recalc, /* sets are keyed on mpu rate */
.set_rate = &omap2_select_table_rate,
Expand Down

0 comments on commit b341dc4

Please sign in to comment.