From b341dc4325c68d0e6c6064360265eb2187df2eac Mon Sep 17 00:00:00 2001 From: Paul Walmsley Date: Mon, 22 Feb 2010 22:09:15 -0700 Subject: [PATCH] --- yaml --- r: 184807 b: refs/heads/master c: 17d092733d9ffd7fcf6da36169a60caf8400fc4c h: refs/heads/master i: 184805: af70a5d65c2f73e7ebb1671c026ce1f2e6c16a40 184803: 9f4bc7957c86246dcd8aa4ac90796cdb9754be43 184799: d7ea1fc743d0da56f13c20fbe9e553206449da43 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/clock2xxx_data.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4175a89ee5e2..f5604a5e7e2e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94297784eec057ca5425d9cd21a845b109fcaebf +refs/heads/master: 17d092733d9ffd7fcf6da36169a60caf8400fc4c diff --git a/trunk/arch/arm/mach-omap2/clock2xxx_data.c b/trunk/arch/arm/mach-omap2/clock2xxx_data.c index d08d545f84f1..aa37761fa457 100644 --- a/trunk/arch/arm/mach-omap2/clock2xxx_data.c +++ b/trunk/arch/arm/mach-omap2/clock2xxx_data.c @@ -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 */ }; @@ -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, }; @@ -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, @@ -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,