Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6af16a1d authored by Rajendra Nayak's avatar Rajendra Nayak Committed by Tony Lindgren
Browse files

ARM: DRA7: Add hook in SoC initcalls to enable pm initialization 



With consolidated code, now we can add the required hooks for
DRA7 to enable power management.

Signed-off-by: default avatarRajendra Nayak <rnayak@ti.com>
[nm@ti.com: minor modifications]
Signed-off-by: default avatarNishanth Menon <nm@ti.com>
Reviewed-by: default avatarKevin Hilman <khilman@linaro.org>
Tested-by: default avatarKevin Hilman <khilman@linaro.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 887782e0

arch/arm/mach-omap2/common.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static inline int omap3_pm_init(void) 
}

#endif



#if defined(CONFIG_PM) && (defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5))

#if defined(CONFIG_PM) && (defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX))

int omap4_pm_init(void);

int omap4_pm_init_early(void);

#else

arch/arm/mach-omap2/io.c

+3 −0
Original line number Diff line number Diff line
@@ -698,6 +698,7 @@ void __init dra7xx_init_early(void) 
	omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(DRA7XX_CM_CORE_AON_BASE),

			     OMAP2_L4_IO_ADDRESS(OMAP54XX_CM_CORE_BASE));

	omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE));

	omap4_pm_init_early();

	omap_prm_base_init();

	omap_cm_base_init();

	omap44xx_prm_init();
@@ -712,6 +713,8 @@ void __init dra7xx_init_early(void) 
void __init dra7xx_init_late(void)

{

	omap_common_late_init();

	omap4_pm_init();

	omap2_clk_enable_autoidle_all();

}

#endif