Skip to content

Commit

Permalink
OMAP3: pm: introduce errata handling
Browse files Browse the repository at this point in the history
Introduce errata handling for OMAP3. This patch introduces
errata variable and stub for initialization which will be
filled up by follow-on patches.

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
  • Loading branch information
Nishanth Menon authored and Kevin Hilman committed Dec 21, 2010
1 parent 9d93b8a commit 8cdfd83
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
7 changes: 7 additions & 0 deletions arch/arm/mach-omap2/pm.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,11 @@ extern unsigned int save_secure_ram_context_sz;
extern unsigned int omap24xx_cpu_suspend_sz;
extern unsigned int omap34xx_cpu_suspend_sz;

#if defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP3)
extern u16 pm34xx_errata;
#define IS_PM34XX_ERRATUM(id) (pm34xx_errata & (id))
#else
#define IS_PM34XX_ERRATUM(id) 0
#endif /* defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP3) */

#endif
9 changes: 9 additions & 0 deletions arch/arm/mach-omap2/pm34xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ static inline bool is_suspending(void)
#define OMAP343X_TABLE_VALUE_OFFSET 0xc0
#define OMAP343X_CONTROL_REG_VALUE_OFFSET 0xc8

/* pm34xx errata defined in pm.h */
u16 pm34xx_errata;

struct power_state {
struct powerdomain *pwrdm;
u32 next_state;
Expand Down Expand Up @@ -991,6 +994,10 @@ void omap_push_sram_idle(void)
save_secure_ram_context_sz);
}

static void __init pm_errata_configure(void)
{
}

static int __init omap3_pm_init(void)
{
struct power_state *pwrst, *tmp;
Expand All @@ -1000,6 +1007,8 @@ static int __init omap3_pm_init(void)
if (!cpu_is_omap34xx())
return -ENODEV;

pm_errata_configure();

printk(KERN_ERR "Power Management for TI OMAP3.\n");

/* XXX prcm_setup_regs needs to be before enabling hw
Expand Down

0 comments on commit 8cdfd83

Please sign in to comment.