mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-05 00:20:32 +00:00
Code Issues Releases Wiki Activity

ARM: OMAP4+: move errata initialization to omap4_pm_init_early

Browse source 
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: Tony Lindgren <tony@atomide.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Nishanth Menon 2014-01-20 14:06:37 -06:00 committed by Olof Johansson
parent 74ed7bdcb4
commit de70af494c
4 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/mach-omap2/common.h
View file

@ -62,11 +62,17 @@ static inline int omap3_pm_init(void)
#if defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP4) #if defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP4)
int omap4_pm_init(void); int omap4_pm_init(void);
int omap4_pm_init_early(void);
#else #else
static inline int omap4_pm_init(void) static inline int omap4_pm_init(void)
{ {
return 0; return 0;
} }
static inline int omap4_pm_init_early(void)
{
return 0;
}
#endif #endif
#ifdef CONFIG_OMAP_MUX #ifdef CONFIG_OMAP_MUX

1
arch/arm/mach-omap2/io.c
View file

@ -641,6 +641,7 @@ void __init omap4430_init_early(void)
omap_cm_base_init(); omap_cm_base_init();
omap4xxx_check_revision(); omap4xxx_check_revision();
omap4xxx_check_features(); omap4xxx_check_features();
omap4_pm_init_early();
omap44xx_prm_init(); omap44xx_prm_init();
omap44xx_voltagedomains_init(); omap44xx_voltagedomains_init();
omap44xx_powerdomains_init(); omap44xx_powerdomains_init();

6
arch/arm/mach-omap2/omap-smp.c
View file

@ -39,8 +39,6 @@
#define OMAP5_CORE_COUNT 0x2 #define OMAP5_CORE_COUNT 0x2
u16 pm44xx_errata;
/* SCU base address */ /* SCU base address */
static void __iomem *scu_base; static void __iomem *scu_base;
@ -217,10 +215,8 @@ static void __init omap4_smp_prepare_cpus(unsigned int max_cpus)
if (scu_base) if (scu_base)
scu_enable(scu_base); scu_enable(scu_base);
if (cpu_is_omap446x()) { if (cpu_is_omap446x())
startup_addr = omap4460_secondary_startup; startup_addr = omap4460_secondary_startup;
pm44xx_errata |= PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD;
}
/* /*
* Write the address of secondary startup routine into the * Write the address of secondary startup routine into the

15
arch/arm/mach-omap2/pm44xx.c
View file

@ -24,6 +24,8 @@
#include "powerdomain.h" #include "powerdomain.h"
#include "pm.h" #include "pm.h"
u16 pm44xx_errata;
struct power_state { struct power_state {
struct powerdomain *pwrdm; struct powerdomain *pwrdm;
u32 next_state; u32 next_state;
@ -198,6 +200,19 @@ static inline int omap4_init_static_deps(void)
return ret; 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 * omap4_pm_init - Init routine for OMAP4+ devices
* *