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

Commit de70af49 authored by Nishanth Menon's avatar Nishanth Menon Committed by Olof Johansson
Browse files

ARM: OMAP4+: move errata initialization to omap4_pm_init_early 



Move all OMAP4 PM errata initializations to centralized location in
omap4_pm_init_early. This allows for users to utilize the erratas
in various submodules as needed.

Reported-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarNishanth Menon <nm@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 74ed7bdc

arch/arm/mach-omap2/common.h

+6 −0
Original line number Diff line number Diff line
@@ -62,11 +62,17 @@ static inline int omap3_pm_init(void) 


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

int omap4_pm_init(void);

int omap4_pm_init_early(void);

#else

static inline int omap4_pm_init(void)

{

	return 0;

}



static inline int omap4_pm_init_early(void)

{

	return 0;

}

#endif



#ifdef CONFIG_OMAP_MUX

arch/arm/mach-omap2/io.c

+1 −0
Original line number Diff line number Diff line
@@ -641,6 +641,7 @@ void __init omap4430_init_early(void) 
	omap_cm_base_init();

	omap4xxx_check_revision();

	omap4xxx_check_features();

	omap4_pm_init_early();

	omap44xx_prm_init();

	omap44xx_voltagedomains_init();

	omap44xx_powerdomains_init();

arch/arm/mach-omap2/omap-smp.c

+1 −5
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ 


#define OMAP5_CORE_COUNT	0x2



u16 pm44xx_errata;



/* SCU base address */

static void __iomem *scu_base;
@@ -217,10 +215,8 @@ static void __init omap4_smp_prepare_cpus(unsigned int max_cpus) 
	if (scu_base)

		scu_enable(scu_base);



	if (cpu_is_omap446x()) {

	if (cpu_is_omap446x())

		startup_addr = omap4460_secondary_startup;

		pm44xx_errata |= PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD;

	}



	/*

	 * Write the address of secondary startup routine into the

arch/arm/mach-omap2/pm44xx.c

+15 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
#include "powerdomain.h"

#include "pm.h"



u16 pm44xx_errata;



struct power_state {

	struct powerdomain *pwrdm;

	u32 next_state;
@@ -198,6 +200,19 @@ static inline int omap4_init_static_deps(void) 
	return ret;

}



/**

 * omap4_pm_init_early - Does early initialization necessary for OMAP4+ devices

 *

 * Initializes basic stuff for power management functionality.

 */

int __init omap4_pm_init_early(void)

{

	if (cpu_is_omap446x())

		pm44xx_errata |= PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD;



	return 0;

}



/**

 * omap4_pm_init - Init routine for OMAP4+ devices

 *