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

Commit d8b53257 authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Kukjin Kim
Browse files

ARM: S3C24XX: cpufreq-utils: don't write raw values to MPLLCON when using ccf 



The s3c24xx cpufreq driver needs to change the mpll speed and was doing
this by writing raw values from a translation table into the MPLLCON
register.

Change this to use a regular clk_set_rate call when using the common
clock framework and only write the raw value in the samsung_clock case.

The s3c cpufreq driver does already aquire the mpll, so simply add a reference
to struct s3c_cpufreq_config to let set_fvco access it.

While struct clk is opaque the differenciation between samsung clock and
common clock is kept, as the samsung-clock mpll clk does not implement a
real set_rate.

Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Acked-by: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 3c27f314

arch/arm/mach-s3c24xx/cpufreq-utils.c

+8 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/errno.h>

#include <linux/cpufreq.h>

#include <linux/io.h>

#include <linux/clk.h>



#include <mach/map.h>

#include <mach/regs-clock.h>
@@ -60,5 +61,12 @@ void s3c2410_cpufreq_setrefresh(struct s3c_cpufreq_config *cfg) 
 */

void s3c2410_set_fvco(struct s3c_cpufreq_config *cfg)

{

#ifdef CONFIG_SAMSUNG_CLOCK

	__raw_writel(cfg->pll.driver_data, S3C2410_MPLLCON);

#endif



#ifdef CONFIG_COMMON_CLK

	if (!IS_ERR(cfg->mpll))

		clk_set_rate(cfg->mpll, cfg->pll.frequency);

#endif

}

arch/arm/plat-samsung/include/plat/cpu-freq-core.h

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ struct s3c_plltab { 
struct s3c_cpufreq_config {

	struct s3c_freq		freq;

	struct s3c_freq		max;

	struct clk		*mpll;

	struct cpufreq_frequency_table pll;

	struct s3c_clkdivs	divs;

	struct s3c_cpufreq_info *info;	/* for core, not drivers */

drivers/cpufreq/s3c24xx-cpufreq.c

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ static int s3c_cpufreq_calcdivs(struct s3c_cpufreq_config *cfg) 


static void s3c_cpufreq_setfvco(struct s3c_cpufreq_config *cfg)

{

	cfg->mpll = _clk_mpll;

	(cfg->info->set_fvco)(cfg);

}