diff options
| author | Jack Lee <jacklee@freescale.com> | 2012-09-11 12:54:19 +0800 |
|---|---|---|
| committer | Jack Lee <jacklee@freescale.com> | 2012-09-11 12:54:19 +0800 |
| commit | 19379babbacd1785ec7e8e81f1a037028cf8a005 (patch) | |
| tree | 145077aae3cb23cb2b5a7ff840bba01eddab659c /arch/arm/mach-mx6/clock_mx6sl.c | |
| parent | 5b8d316ca74e43a2d12f1e6d8067629190c5da16 (diff) | |
| parent | d97b871cc396738ff62293df6b4ba78ade44b6d2 (diff) | |
Merge commit 'rel_imx_3.0.35_12.09.02_RC2' into eink
Diffstat (limited to 'arch/arm/mach-mx6/clock_mx6sl.c')
| -rwxr-xr-x | arch/arm/mach-mx6/clock_mx6sl.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-mx6/clock_mx6sl.c b/arch/arm/mach-mx6/clock_mx6sl.c index 9742db4907f5..b4268f5f4a4f 100755 --- a/arch/arm/mach-mx6/clock_mx6sl.c +++ b/arch/arm/mach-mx6/clock_mx6sl.c @@ -1244,9 +1244,6 @@ static int _clk_arm_set_rate(struct clk *clk, unsigned long rate) return -1; } - if (!pll1_enabled) - pll1_sys_main_clk.enable(&pll1_sys_main_clk); - cur_arm_podf = div; __raw_writel(div - 1, MXC_CCM_CACRR); |