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

Commit 57137181 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] omap: kill PARENT_CONTROLS_CLOCK 



PARENT_CONTROLS_CLOCK just makes enable/disable no-op, and is
functionally an alias for ALWAYS_ENABLED.  This can be handled
in the same way, using clkops_null.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 897dcded

arch/arm/mach-omap2/clock.c

+0 −6
Original line number Diff line number Diff line
@@ -271,9 +271,6 @@ int _omap2_clk_enable(struct clk *clk) 
{

	u32 regval32;



	if (clk->flags & PARENT_CONTROLS_CLOCK)

		return 0;



	if (clk->ops && clk->ops->enable)

		return clk->ops->enable(clk);
@@ -301,9 +298,6 @@ void _omap2_clk_disable(struct clk *clk) 
{

	u32 regval32;



	if (clk->flags & PARENT_CONTROLS_CLOCK)

		return;



	if (clk->ops && clk->ops->disable) {

		clk->ops->disable(clk);

		return;

arch/arm/mach-omap2/clock24xx.h

+14 −8
Original line number Diff line number Diff line
@@ -742,9 +742,10 @@ static const struct clksel func_54m_clksel[] = { 


static struct clk func_54m_ck = {

	.name		= "func_54m_ck",

	.ops		= &clkops_null,

	.parent		= &apll54_ck,	/* can also be alt_clk */

	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |

				RATE_PROPAGATES | PARENT_CONTROLS_CLOCK,

				RATE_PROPAGATES,

	.clkdm_name	= "wkup_clkdm",

	.init		= &omap2_init_clksel_parent,

	.clksel_reg	= OMAP_CM_REGADDR(PLL_MOD, CM_CLKSEL1),
@@ -783,9 +784,10 @@ static const struct clksel func_96m_clksel[] = { 
/* The parent of this clock is not selectable on 2420. */

static struct clk func_96m_ck = {

	.name		= "func_96m_ck",

	.ops		= &clkops_null,

	.parent		= &apll96_ck,

	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |

				RATE_PROPAGATES | PARENT_CONTROLS_CLOCK,

				RATE_PROPAGATES,

	.clkdm_name	= "wkup_clkdm",

	.init		= &omap2_init_clksel_parent,

	.clksel_reg	= OMAP_CM_REGADDR(PLL_MOD, CM_CLKSEL1),
@@ -816,9 +818,10 @@ static const struct clksel func_48m_clksel[] = { 


static struct clk func_48m_ck = {

	.name		= "func_48m_ck",

	.ops		= &clkops_null,

	.parent		= &apll96_ck,	 /* 96M or Alt */

	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |

				RATE_PROPAGATES | PARENT_CONTROLS_CLOCK,

				RATE_PROPAGATES,

	.clkdm_name	= "wkup_clkdm",

	.init		= &omap2_init_clksel_parent,

	.clksel_reg	= OMAP_CM_REGADDR(PLL_MOD, CM_CLKSEL1),
@@ -831,10 +834,11 @@ static struct clk func_48m_ck = { 


static struct clk func_12m_ck = {

	.name		= "func_12m_ck",

	.ops		= &clkops_null,

	.parent		= &func_48m_ck,

	.fixed_div	= 4,

	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |

				RATE_PROPAGATES | PARENT_CONTROLS_CLOCK,

				RATE_PROPAGATES,

	.clkdm_name	= "wkup_clkdm",

	.recalc		= &omap2_fixed_divisor_recalc,

};
@@ -917,9 +921,9 @@ static const struct clksel sys_clkout_clksel[] = { 


static struct clk sys_clkout = {

	.name		= "sys_clkout",

	.ops		= &clkops_null,

	.parent		= &sys_clkout_src,

	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |

				PARENT_CONTROLS_CLOCK,

	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,

	.clkdm_name	= "wkup_clkdm",

	.clksel_reg	= OMAP24XX_PRCM_CLKOUT_CTRL,

	.clksel_mask	= OMAP24XX_CLKOUT_DIV_MASK,
@@ -954,8 +958,9 @@ static const struct clksel sys_clkout2_clksel[] = { 
/* In 2430, new in 2420 ES2 */

static struct clk sys_clkout2 = {

	.name		= "sys_clkout2",

	.ops		= &clkops_null,

	.parent		= &sys_clkout2_src,

	.flags		= CLOCK_IN_OMAP242X | PARENT_CONTROLS_CLOCK,

	.flags		= CLOCK_IN_OMAP242X,

	.clkdm_name	= "wkup_clkdm",

	.clksel_reg	= OMAP24XX_PRCM_CLKOUT_CTRL,

	.clksel_mask	= OMAP2420_CLKOUT2_DIV_MASK,
@@ -1076,9 +1081,10 @@ static const struct clksel dsp_irate_ick_clksel[] = { 
/* This clock does not exist as such in the TRM. */

static struct clk dsp_irate_ick = {

	.name		= "dsp_irate_ick",

	.ops		= &clkops_null,

	.parent		= &dsp_fck,

	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X | DELAYED_APP |

				CONFIG_PARTICIPANT | PARENT_CONTROLS_CLOCK,

				CONFIG_PARTICIPANT,

	.clksel_reg	= OMAP_CM_REGADDR(OMAP24XX_DSP_MOD, CM_CLKSEL),

	.clksel_mask	= OMAP24XX_CLKSEL_DSP_IF_MASK,

	.clksel		= dsp_irate_ick_clksel,

arch/arm/mach-omap2/clock34xx.h

+100 −96

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/plat-omap/include/mach/clock.h

+0 −1
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ extern const struct clkops clkops_null; 
#define CLOCK_IN_OMAP242X	(1 << 25)

#define CLOCK_IN_OMAP243X	(1 << 26)

#define CLOCK_IN_OMAP343X	(1 << 27)	/* clocks common to all 343X */

#define PARENT_CONTROLS_CLOCK	(1 << 28)

#define CLOCK_IN_OMAP3430ES1	(1 << 29)	/* 3430ES1 clocks only */

#define CLOCK_IN_OMAP3430ES2	(1 << 30)	/* 3430ES2 clocks only */