]> git.baikalelectronics.ru Git - kernel.git/commit
ARM: imx6: Initialize low-power mode early again
authorPhilipp Zabel <p.zabel@pengutronix.de>
Wed, 29 Jan 2014 16:10:04 +0000 (17:10 +0100)
committerKevin Hilman <khilman@linaro.org>
Mon, 10 Feb 2014 18:37:32 +0000 (10:37 -0800)
commitdae12ae14aea80aa1e6cc103e102933f04381fd9
tree4cc2a5bb059a3b799464a6240da25c13ff13a1bc
parenta0fed5899e5db6e1a086a812ddf0181eda38d911
ARM: imx6: Initialize low-power mode early again

Since commit b3cf05d5009050b0506806cf5ccacf85d01dd9c1
"ARM: imx6q: move low-power code out of clock driver"
the kernel fails to boot on i.MX6Q/D if preemption is
enabled (CONFIG_PREEMPT=y). The kernel just hangs
before the console comes up.

The above commit moved the initalization of the low-power
mode setting (enabling clocked WAIT states), which was
introduced in commit 62ead423746e3e5da5f8b84521f78317357f0b16
"ARM: imx: correct low-power mode setting", from
imx6q_clks_init to imx6q_pm_init. Now it is called
much later, after all cores are enabled.

This patch moves the low-power mode initialization back
to imx6q_clks_init again (and to imx6sl_clks_init).

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
arch/arm/mach-imx/clk-imx6q.c
arch/arm/mach-imx/clk-imx6sl.c
arch/arm/mach-imx/pm-imx6q.c