diff options
| author | Andy Green <andy.green@linaro.org> | 2015-06-28 15:24:51 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2015-06-28 15:28:42 +0800 |
| commit | c43eb3b629425191b5bd5ba39bfd03028fda6ba6 (patch) | |
| tree | 877d57566b66f8fdaa0b76e8f6a8d6074664ae86 | |
| parent | d1d053e653a6c9e835149060c235f61317c30971 (diff) | |
px1928 disable spread spectrumhelium-hdmi-test-2015-06-28-1helium-hdmi
Signed-off-by: Andy Green <andy.green@linaro.org>
| -rw-r--r-- | drivers/clk/mmp/clk-pll-pxa1928.c | 2 | ||||
| -rw-r--r-- | drivers/clk/mmp/clk-pxa1928.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/clk/mmp/clk-pll-pxa1928.c b/drivers/clk/mmp/clk-pll-pxa1928.c index 40e0db40a1ed..0e5d705c00ac 100644 --- a/drivers/clk/mmp/clk-pll-pxa1928.c +++ b/drivers/clk/mmp/clk-pll-pxa1928.c @@ -202,7 +202,7 @@ static void __pxa1928_vco_set_ssc(struct pxa1928_clk_pll_vco *vco, writel_mpmu(pll_ctrl3.val, vco, reg_pll_ctrl3); pll_ctrl2.val = readl_mpmu(vco, reg_pll_ctrl2); - pll_ctrl2.bit.ssc_clk_en = 1; + pll_ctrl2.bit.ssc_clk_en = !!(vco->flags & PXA1928_PLL_SSC_ALWAYS_EN); writel_mpmu(pll_ctrl2.val, vco, reg_pll_ctrl2); spin_unlock_irqrestore(vco->lock, flags); /* FIXME: wait >1us (SSC reset time) */ diff --git a/drivers/clk/mmp/clk-pxa1928.c b/drivers/clk/mmp/clk-pxa1928.c index 5fa24273794b..6dbeab9e57a4 100644 --- a/drivers/clk/mmp/clk-pxa1928.c +++ b/drivers/clk/mmp/clk-pxa1928.c @@ -439,8 +439,6 @@ static struct pll_tbl pllx_tbl[] = { .outp_tbl = pll3_outp_table, .out_flags = 0, .outp_flags = PXA1928_PLL_USE_ENABLE_BIT, - .vco_flags = PXA1928_PLL_SSC_ALWAYS_EN | - PXA1928_PLL_SSC_DOWN_MODE, .vco_params = { 1200000000, 3200000000UL, MPMU_PLL3CR, MPMU_PLL3_CTRL1, MPMU_PLL3_CTRL2, MPMU_PLL3_CTRL3, MPMU_PLL3_CTRL4, |