diff options
author | Tony Lindgren <tony@atomide.com> | 2015-07-06 05:33:17 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2015-07-06 05:33:17 -0700 |
commit | ae745302c0a3e2b5b768690f631fc14db44467e7 (patch) | |
tree | 1db4d210a7419286b447dc09fa7400a561d55f42 /arch/arm/mach-imx/mach-imx6q.c | |
parent | e3abe2556b2a689b28926cd1581f0b97e9d2afa4 (diff) | |
parent | 22a5dc10e3f8fb8370748ea19dc4e3e1620d8296 (diff) | |
download | linux-ae745302c0a3e2b5b768690f631fc14db44467e7.tar.bz2 |
Merge branch 'fixes-rc1' into omap-for-v4.2/fixes
Diffstat (limited to 'arch/arm/mach-imx/mach-imx6q.c')
-rw-r--r-- | arch/arm/mach-imx/mach-imx6q.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 3ab61549ce0f..9602cc12d2f1 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -393,6 +393,7 @@ static void __init imx6q_init_irq(void) imx_init_l2cache(); imx_src_init(); irqchip_init(); + imx6_pm_ccm_init("fsl,imx6q-ccm"); } static const char * const imx6q_dt_compat[] __initconst = { |