summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorAnson Huang <b20788@freescale.com>2013-11-15 13:14:18 -0500
committerShawn Guo <shawn.guo@linaro.org>2013-12-31 09:36:21 +0800
commit8202a3ce9ccc6a6bfdae072b8c735a1f894f8b74 (patch)
tree169b3dcfbbac1e0e7f03a336d3de53e0690cc6dd /arch/arm/mach-imx
parent490dd8808a8baa093ac3b2bfc2f66f798599bb2c (diff)
downloadlinux-8202a3ce9ccc6a6bfdae072b8c735a1f894f8b74.tar.gz
linux-8202a3ce9ccc6a6bfdae072b8c735a1f894f8b74.tar.bz2
linux-8202a3ce9ccc6a6bfdae072b8c735a1f894f8b74.zip
ARM: imx: clk: correct arm clock usecount
ARM clock is sourcing from pll1_sw, and pll1_sw can be either from pll1_sys or step, so we should enable arm clock during clock initialization instead of pll1_sys, otherwise, arm clock's usecount would be incorrect and PLL1 will never be disabled even it is not used. Signed-off-by: Anson Huang <b20788@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r--arch/arm/mach-imx/clk-imx6q.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
index 04cfd0fcb0e5..74ecceb4b5f4 100644
--- a/arch/arm/mach-imx/clk-imx6q.c
+++ b/arch/arm/mach-imx/clk-imx6q.c
@@ -114,7 +114,7 @@ static struct clk *clk[clk_max];
static struct clk_onecell_data clk_data;
static enum mx6q_clks const clks_init_on[] __initconst = {
- mmdc_ch0_axi, rom, pll1_sys,
+ mmdc_ch0_axi, rom, arm,
};
static struct clk_div_table clk_enet_ref_table[] = {