Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

msm: clock-8960: Store current HDMI PLL rate in clk->rate

Browse source 
This allows for a vdd_class, which reference clk->rate, to be used
with the HDMI PLL. It also removes the need to have a .get_rate
op implemented.

Change-Id: I1fd7eba16fa1e1af56513d400e58fdfdaff931e4
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
This commit is contained in:
Matt Wagantall 2012-07-09 19:24:42 -07:00 committed by Stephen Boyd
parent dd4d59b117
commit dcbc3173b6
3 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/arm/mach-msm/clock-8960.c
View file

@ -3912,11 +3912,6 @@ static void hdmi_pll_clk_disable(struct clk *c)
spin_unlock_irqrestore(&local_clock_reg_lock, flags);
}
static unsigned long hdmi_pll_clk_get_rate(struct clk *c)
{
return hdmi_pll_get_rate();
}
static struct clk *hdmi_pll_clk_get_parent(struct clk *c)
{
return &pxo_clk.c;
@ -3925,7 +3920,6 @@ static struct clk *hdmi_pll_clk_get_parent(struct clk *c)
static struct clk_ops clk_ops_hdmi_pll = {
.enable = hdmi_pll_clk_enable,
.disable = hdmi_pll_clk_disable,
.get_rate = hdmi_pll_clk_get_rate,
.get_parent = hdmi_pll_clk_get_parent,
};
@ -3975,8 +3969,10 @@ static unsigned long fmax_tv_src_8064[MAX_VDD_LEVELS] __initdata = {
void set_rate_tv(struct rcg_clk *rcg, struct clk_freq_tbl *nf)
{
unsigned long pll_rate = (unsigned long)nf->extra_freq_data;
if (pll_rate)
if (pll_rate) {
hdmi_pll_set_rate(pll_rate);
hdmi_pll_clk.rate = pll_rate;
}
set_rate_mnd(rcg, nf);
}

7
arch/arm/mach-msm/clock-dss-8960.c
View file

@ -90,7 +90,6 @@
#define PLL_PWRDN_B BIT(3)
#define PD_PLL BIT(1)
static unsigned current_rate;
static unsigned hdmi_pll_on;
int hdmi_pll_enable(void)
@ -219,11 +218,6 @@ void hdmi_pll_disable(void)
hdmi_pll_on = 0;
}
unsigned hdmi_pll_get_rate(void)
{
return current_rate;
}
int hdmi_pll_set_rate(unsigned rate)
{
unsigned int set_power_dwn = 0;
@ -378,7 +372,6 @@ int hdmi_pll_set_rate(unsigned rate)
if (set_power_dwn)
hdmi_pll_enable();
current_rate = rate;
if (!ahb_enabled)
writel_relaxed(ahb_en_reg & ~BIT(4), AHB_EN_REG);

1
arch/arm/mach-msm/clock-dss-8960.h
View file

@ -15,7 +15,6 @@
int hdmi_pll_enable(void);
void hdmi_pll_disable(void);
unsigned hdmi_pll_get_rate(void);
int hdmi_pll_set_rate(unsigned rate);
#endif