aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/pm24xx.c
diff options
context:
space:
mode:
authorIgor Grinberg <grinberg@compulab.co.il>2012-08-28 19:18:51 -0400
committerTony Lindgren <tony@atomide.com>2012-09-10 19:33:59 -0400
commitb61968e5cfbc511cefb7567e2d3e2fb722b35c61 (patch)
tree8cbee5bd2ec3b89581459d862bb36a80eed2d2dd /arch/arm/mach-omap2/pm24xx.c
parente54adb1e79762d3591459e5b0e9b9ff578e33fdb (diff)
ARM: OMAP: remove the sti console workaround
The sti console workaround uses the OMAP custom tags. Those tags are not used in upstream kernel and therefore the workaround never fires on upstream kernels. Remove the sti console workaround tags part. This leaves the workaround functional part intact so can be reused if needed. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/pm24xx.c')
-rw-r--r--arch/arm/mach-omap2/pm24xx.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c
index 2edeffc923a6..9e54dc917abd 100644
--- a/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c
@@ -352,16 +352,6 @@ int __init omap2_pm_init(void)
352 352
353 prcm_setup_regs(); 353 prcm_setup_regs();
354 354
355 /* Hack to prevent MPU retention when STI console is enabled. */
356 {
357 const struct omap_sti_console_config *sti;
358
359 sti = omap_get_config(OMAP_TAG_STI_CONSOLE,
360 struct omap_sti_console_config);
361 if (sti != NULL && sti->enable)
362 sti_console_enabled = 1;
363 }
364
365 /* 355 /*
366 * We copy the assembler sleep/wakeup routines to SRAM. 356 * We copy the assembler sleep/wakeup routines to SRAM.
367 * These routines need to be in SRAM as that's the only 357 * These routines need to be in SRAM as that's the only