Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17d09273 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

OMAP2xxx clock: drop DELAYED_APP flag from non-clksel clocks 



The DELAYED_APP flag is effective only with clksel clocks, so drop it from
clocks that are not rate-changeable or that use non-clksel rate changing code
(e.g., virt_prcm_set).

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Richard Woodruff <r-woodruff2@ti.com>
parent 94297784

arch/arm/mach-omap2/clock2xxx_data.c

+3 −4
Original line number Diff line number Diff line
@@ -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,