MLK-13869 ARM: imx7d: run pm init during intialization

This patch adds code that was missed during the rebase of the imx7 PM
patches.

Signed-off-by: Octavian Purdila <octavian.purdila@nxp.com>

diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h
index b74c71d..355dcb0 100644 (file)
--- a/arch/arm/mach-imx/common.h
+++ b/arch/arm/mach-imx/common.h
@@ -218,6 +218,7 @@ void imx6sl_pm_init(void);
 void imx6sx_pm_init(void);
 void imx6ul_pm_init(void);
 void imx6ull_pm_init(void);
+void imx7d_pm_init(void);
 void imx7ulp_pm_init(void);
 void imx7ulp_enable_nmi(void);
 void imx6q_pm_set_ccm_base(void __iomem *base);

diff --git a/arch/arm/mach-imx/mach-imx7d.c b/arch/arm/mach-imx/mach-imx7d.c
index 717e724..ce12289 100644 (file)
--- a/arch/arm/mach-imx/mach-imx7d.c
+++ b/arch/arm/mach-imx/mach-imx7d.c
@@ -131,12 +131,15 @@ static void __init imx7d_init_machine(void)
        if (parent == NULL)
                pr_warn("failed to initialize soc device\n");
 
+       of_platform_default_populate(NULL, NULL, parent);
+       imx7d_pm_init();
        imx_anatop_init();
        imx7d_enet_init();
 }
 
 static void __init imx7d_init_irq(void)
 {
+       imx_gpcv2_check_dt();
        imx_init_revision_from_anatop();
        imx_src_init();
        irqchip_init();
@@ -173,4 +176,5 @@ DT_MACHINE_START(IMX7D, "Freescale i.MX7 Dual (Device Tree)")
        .init_machine   = imx7d_init_machine,
        .init_late      = imx7d_init_late,
        .dt_compat      = imx7d_dt_compat,
+       .restart        = mxc_restart,
 MACHINE_END