diff options
| author | Bai Ping <ping.bai@nxp.com> | 2016-02-21 14:53:50 +0800 |
|---|---|---|
| committer | Bai Ping <ping.bai@nxp.com> | 2016-02-21 17:07:48 +0800 |
| commit | 846e1997b92e5999a0a6a49ddda3604737adc343 (patch) | |
| tree | 8ad0109e166c724c6d32ad2846f77421fa0795f2 /arch | |
| parent | 2f82c287304b6e9e765c7084498aa20d05c5cf0e (diff) | |
MLK-12430 ARM: imx: enable and bypass pll1_bypass clk before changing arm_podf
Before changing the ARM_PODF, the pll1_bypass clock should be enabled and
bypassed to make sure the ARM_PODF can be changed.
Signed-off-by: Bai Ping <ping.bai@nxp.com>
(cherry picked from commit 78916c528cb424b20e87887c85246fceac81f3b4)
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/busfreq-imx.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/busfreq-imx.c b/arch/arm/mach-imx/busfreq-imx.c index 89a5bd6815a1..7803ea44d3d5 100644 --- a/arch/arm/mach-imx/busfreq-imx.c +++ b/arch/arm/mach-imx/busfreq-imx.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2015 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright (C) 2011-2016 Freescale Semiconductor, Inc. All Rights Reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -369,6 +369,12 @@ static void enter_lpm_imx6sl(void) imx_clk_set_parent(pll1_sw_clk, step_clk); /* + * Need to ensure that PLL1 is bypassed and enabled + * before ARM-PODF is set. + */ + clk_set_parent(pll1_bypass_clk, pll1_bypass_src_clk); + + /* * Ensure that the clock will be * at original speed. */ |