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

Commit 88695843 authored by Jaecheol Lee's avatar Jaecheol Lee Committed by Kukjin Kim
Browse files

ARM: S5PV210: Add struct clk_ops for clk_fout_apll 



Current fout_apll has fixed rate value. So CPUFREQ driver gets
incorrect value when finding current CPU frequency. Because some
operation level need to change APLL.
Added get_rate function for fout_apll can give correct frequency
value when calling get_rate function.

Signed-off-by: default avatarJaecheol Lee <jc.lee@samsung.com>
Signed-off-by: default avatarSangbeom Kim <sbkim73@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent b7a98255

arch/arm/mach-s5pv210/clock.c

+12 −2
Original line number Original line Diff line number Diff line
@@ -31,6 +31,8 @@ 
#include <plat/clock-clksrc.h>

#include <plat/clock-clksrc.h>

#include <plat/s5pv210.h>

#include <plat/s5pv210.h>





static unsigned long xtal;



static struct clksrc_clk clk_mout_apll = {

static struct clksrc_clk clk_mout_apll = {

	.clk	= {

	.clk	= {

		.name		= "mout_apll",

		.name		= "mout_apll",
@@ -268,6 +270,15 @@ static struct clk_ops clk_hclk_imem_ops = { 
	.get_rate	= s5pv210_clk_imem_get_rate,

	.get_rate	= s5pv210_clk_imem_get_rate,

};

};





static unsigned long s5pv210_clk_fout_apll_get_rate(struct clk *clk)

{

	return s5p_get_pll45xx(xtal, __raw_readl(S5P_APLL_CON), pll_4508);

}



static struct clk_ops clk_fout_apll_ops = {

	.get_rate	= s5pv210_clk_fout_apll_get_rate,

};



static struct clk init_clocks_disable[] = {

static struct clk init_clocks_disable[] = {

	{

	{

		.name		= "rot",

		.name		= "rot",
@@ -958,7 +969,6 @@ static struct clksrc_clk *sysclks[] = { 
void __init_or_cpufreq s5pv210_setup_clocks(void)

void __init_or_cpufreq s5pv210_setup_clocks(void)

{

{

	struct clk *xtal_clk;

	struct clk *xtal_clk;

	unsigned long xtal;

	unsigned long vpllsrc;

	unsigned long vpllsrc;

	unsigned long armclk;

	unsigned long armclk;

	unsigned long hclk_msys;

	unsigned long hclk_msys;
@@ -996,7 +1006,7 @@ void __init_or_cpufreq s5pv210_setup_clocks(void) 
	vpllsrc = clk_get_rate(&clk_vpllsrc.clk);

	vpllsrc = clk_get_rate(&clk_vpllsrc.clk);

	vpll = s5p_get_pll45xx(vpllsrc, __raw_readl(S5P_VPLL_CON), pll_4502);

	vpll = s5p_get_pll45xx(vpllsrc, __raw_readl(S5P_VPLL_CON), pll_4502);





	clk_fout_apll.rate = apll;

	clk_fout_apll.ops = &clk_fout_apll_ops;

	clk_fout_mpll.rate = mpll;

	clk_fout_mpll.rate = mpll;

	clk_fout_epll.rate = epll;

	clk_fout_epll.rate = epll;

	clk_fout_vpll.rate = vpll;

	clk_fout_vpll.rate = vpll;