dss2 dvfs fix.

dss2 dvfs fix.

[Woodruff, Richard]

Hi,

While testing low power refresh I noticed the DSS2 clock setting wasn't
being perserved across DVFS changes.  The below makes sure to not change
the source for DSS2.

Signed-off-by: Richard Woodruff  <r-woodruff2@ti.com>

diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index f6da2bd..a7792d3 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -995,7 +995,7 @@ static int omap2_clk_set_parent(struct clk *clk,
struct clk *new_parent)
 /* Sets basic clocks based on the specified rate */
 static int omap2_select_table_rate(struct clk * clk, unsigned long
rate)
 {
-	u32 flags, cur_rate, done_rate, bypass = 0;
+	u32 flags, cur_rate, done_rate, bypass = 0, tmp;
 	u8 cpu_mask = 0;
 	struct prcm_config *prcm;
 	unsigned long found_speed = 0;
@@ -1056,7 +1056,8 @@ static int omap2_select_table_rate(struct clk *
clk, unsigned long rate)
 		cm_write_mod_reg(prcm->cm_clksel_gfx, GFX_MOD,
CM_CLKSEL);
 
 		/* Major subsystem dividers */
-		cm_write_mod_reg(prcm->cm_clksel1_core, CORE_MOD,
CM_CLKSEL1);
+		tmp = cm_read_mod_reg(CORE_MOD, CM_CLKSEL1) & 0x2000;
+		cm_write_mod_reg(prcm->cm_clksel1_core | tmp, CORE_MOD,
CM_CLKSEL1);
 		if (cpu_is_omap2430())
 			cm_write_mod_reg(prcm->cm_clksel_mdm,
 					 OMAP2430_MDM_MOD, CM_CLKSEL);


Regards,
Richard W.

Re: dss2 dvfs fix.

[Tony Lindgren]

* Woodruff, Richard <r-woodruff2@ti.com> [070620 18:49]:
> Hi,
> 
> While testing low power refresh I noticed the DSS2 clock setting wasn't
> being perserved across DVFS changes.  The below makes sure to not change
> the source for DSS2.
> 
> Signed-off-by: Richard Woodruff  <r-woodruff2@ti.com>
> 
> diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
> index f6da2bd..a7792d3 100644
> --- a/arch/arm/mach-omap2/clock.c
> +++ b/arch/arm/mach-omap2/clock.c
> @@ -995,7 +995,7 @@ static int omap2_clk_set_parent(struct clk *clk,
> struct clk *new_parent)
>  /* Sets basic clocks based on the specified rate */
>  static int omap2_select_table_rate(struct clk * clk, unsigned long
> rate)
>  {
> -	u32 flags, cur_rate, done_rate, bypass = 0;
> +	u32 flags, cur_rate, done_rate, bypass = 0, tmp;
>  	u8 cpu_mask = 0;
>  	struct prcm_config *prcm;
>  	unsigned long found_speed = 0;
> @@ -1056,7 +1056,8 @@ static int omap2_select_table_rate(struct clk *
> clk, unsigned long rate)
>  		cm_write_mod_reg(prcm->cm_clksel_gfx, GFX_MOD,
> CM_CLKSEL);
>  
>  		/* Major subsystem dividers */
> -		cm_write_mod_reg(prcm->cm_clksel1_core, CORE_MOD,
> CM_CLKSEL1);
> +		tmp = cm_read_mod_reg(CORE_MOD, CM_CLKSEL1) & 0x2000;
> +		cm_write_mod_reg(prcm->cm_clksel1_core | tmp, CORE_MOD,
> CM_CLKSEL1);
>  		if (cpu_is_omap2430())
>  			cm_write_mod_reg(prcm->cm_clksel_mdm,
>  					 OMAP2430_MDM_MOD, CM_CLKSEL);

Thanks, pushing today. Patch was wrapped BTW...

Tony