From 47f8837a856a73884f805dbbba5b7c3429c039b1 Mon Sep 17 00:00:00 2001 From: Paul Walmsley Date: Mon, 22 Feb 2010 22:09:14 -0700 Subject: [PATCH] --- yaml --- r: 184806 b: refs/heads/master c: 94297784eec057ca5425d9cd21a845b109fcaebf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/clock2xxx_data.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 53df2693fe04..4175a89ee5e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c78a05e8e4a81d01135f4a03544d788b3e203d65 +refs/heads/master: 94297784eec057ca5425d9cd21a845b109fcaebf diff --git a/trunk/arch/arm/mach-omap2/clock2xxx_data.c b/trunk/arch/arm/mach-omap2/clock2xxx_data.c index f20a4b2bc6fc..d08d545f84f1 100644 --- a/trunk/arch/arm/mach-omap2/clock2xxx_data.c +++ b/trunk/arch/arm/mach-omap2/clock2xxx_data.c @@ -737,7 +737,6 @@ static struct clk ssi_l4_ick = { * divided value of fclk. * */ -/* XXX REVISIT: GFX clock is part of CONFIG_PARTICIPANT, no? doublecheck. */ /* This clksel struct is shared between gfx_3d_fck and gfx_2d_fck */ static const struct clksel gfx_fck_clksel[] = { @@ -764,6 +763,7 @@ static struct clk gfx_2d_fck = { .name = "gfx_2d_fck", .ops = &clkops_omap2_dflt_wait, .parent = &core_l3_ck, + .flags = DELAYED_APP | CONFIG_PARTICIPANT, .clkdm_name = "gfx_clkdm", .enable_reg = OMAP_CM_REGADDR(GFX_MOD, CM_FCLKEN), .enable_bit = OMAP24XX_EN_2D_SHIFT, @@ -779,6 +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, .clkdm_name = "gfx_clkdm", .enable_reg = OMAP_CM_REGADDR(GFX_MOD, CM_ICLKEN), .enable_bit = OMAP_EN_GFX_SHIFT,