summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/clock2xxx_data.c
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2010-02-23 06:09:14 +0100
committerPaul Walmsley <paul@pwsan.com>2010-02-24 20:15:04 +0100
commit94297784eec057ca5425d9cd21a845b109fcaebf (patch)
tree5ee5d7da04fc337dcd361b7b4b2be19b98869b42 /arch/arm/mach-omap2/clock2xxx_data.c
parentOMAP4 clock: drop the CLOCK_IN_OMAP4430 clock flag (diff)
downloadlinux-94297784eec057ca5425d9cd21a845b109fcaebf.tar.xz
linux-94297784eec057ca5425d9cd21a845b109fcaebf.zip
OMAP2xxx clock: GFX functional clock rates are not independently changeable
According to the OMAP242x TRM Rev X Figure 5-15 "Clock Output Control - Functional Clocks 2", the GFX functional clocks should be marked both DELAYED_APP and CONFIG_PARTICIPANT, meaning that their rates must be reprogrammed as part of a larger OPP set change. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Richard Woodruff <r-woodruff2@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/clock2xxx_data.c')
-rw-r--r--arch/arm/mach-omap2/clock2xxx_data.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clock2xxx_data.c b/arch/arm/mach-omap2/clock2xxx_data.c
index f20a4b2bc6fc..d08d545f84f1 100644
--- a/arch/arm/mach-omap2/clock2xxx_data.c
+++ b/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,