These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / arm / mach-imx / mach-imx6q.c

diff --git a/kernel/arch/arm/mach-imx/mach-imx6q.c b/kernel/arch/arm/mach-imx/mach-imx6q.c
index 3ab6154..3878494 100644 (file)
--- a/kernel/arch/arm/mach-imx/mach-imx6q.c
+++ b/kernel/arch/arm/mach-imx/mach-imx6q.c
@@ -350,7 +350,7 @@ static void __init imx6q_opp_init(void)
                return;
        }
 
-       if (of_init_opp_table(cpu_dev)) {
+       if (dev_pm_opp_of_add_table(cpu_dev)) {
                pr_warn("failed to init OPP table\n");
                goto put_node;
        }
@@ -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 = {