Commit d4521f67 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

OMAP2xxx clock: fix dss2_fck recalc to use clksel 



dss2_fck is a clksel clock, and therefore its rate should be recalculated
with the clksel mechanism.  This was working in early 2009, but was one of
the casualties of the big OMAP clock merge between 2.6.29 and 2.6.30.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent cb13459b

arch/arm/mach-omap2/clock2420_data.c

+1 −1
Original line number Diff line number Diff line
@@ -812,7 +812,7 @@ static struct clk dss2_fck = { /* Alt clk used in power management */ 
	.clksel_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL1),

	.clksel_mask	= OMAP24XX_CLKSEL_DSS2_MASK,

	.clksel		= dss2_fck_clksel,

	.recalc		= &followparent_recalc,

	.recalc		= &omap2_clksel_recalc,

};



static struct clk dss_54m_fck = {	/* Alt clk used in power management */

arch/arm/mach-omap2/clock2430_data.c

+1 −1
Original line number Diff line number Diff line
@@ -800,7 +800,7 @@ static struct clk dss2_fck = { /* Alt clk used in power management */ 
	.clksel_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL1),

	.clksel_mask	= OMAP24XX_CLKSEL_DSS2_MASK,

	.clksel		= dss2_fck_clksel,

	.recalc		= &followparent_recalc,

	.recalc		= &omap2_clksel_recalc,

};



static struct clk dss_54m_fck = {	/* Alt clk used in power management */

CRA Git | Maintained and supported by SUSTech CRA and CCSE