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

Commit 61255ab9 authored by Rajendra Nayak's avatar Rajendra Nayak Committed by Kevin Hilman
Browse files

OMAP3: PM: MPU off-mode support 



Adds a 'save_state' option when calling into SRAM idle function
and adds some minor cleanups of SRAM asm code.

Signed-off-by: default avatarRajendra Nayak <rnayak@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent 57f277b0

arch/arm/mach-omap2/pm34xx.c

+10 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <plat/powerdomain.h>

#include <plat/control.h>

#include <plat/serial.h>

#include <plat/sdrc.h>



#include <asm/tlbflush.h>
@@ -223,6 +224,9 @@ static void omap_sram_idle(void) 
		/* No need to save context */

		save_state = 0;

		break;

	case PWRDM_POWER_OFF:

		save_state = 3;

		break;

	default:

		/* Invalid state */

		printk(KERN_ERR "Invalid mpu state in sram_idle\n");
@@ -248,7 +252,12 @@ static void omap_sram_idle(void) 
		prm_set_mod_reg_bits(OMAP3430_EN_IO, WKUP_MOD, PM_WKEN);

	}



	_omap_sram_idle(NULL, save_state);

	/*

	 * omap3_arm_context is the location where ARM registers

	 * get saved. The restore path then reads from this

	 * location and restores them back.

	 */

	_omap_sram_idle(omap3_arm_context, save_state);

	cpu_init();



	/* Restore table entry modified during MMU restoration */

arch/arm/mach-omap2/sleep34xx.S

+4 −7
Original line number Diff line number Diff line
@@ -36,12 +36,11 @@ 
				OMAP3430_PM_PREPWSTST)

#define PM_PREPWSTST_MPU_V	OMAP34XX_PRM_REGADDR(MPU_MOD, \

				OMAP3430_PM_PREPWSTST)

#define PM_PWSTCTRL_MPU_P	OMAP34XX_PRM_REGADDR(MPU_MOD, PM_PWSTCTRL)

#define PM_PWSTCTRL_MPU_P	OMAP3430_PRM_BASE + MPU_MOD + PM_PWSTCTRL

#define SCRATCHPAD_MEM_OFFS	0x310 /* Move this as correct place is

				       * available */

#define SCRATCHPAD_BASE_P	OMAP343X_CTRL_REGADDR(\

				OMAP343X_CONTROL_MEM_WKUP +\

				SCRATCHPAD_MEM_OFFS)

#define SCRATCHPAD_BASE_P	(OMAP343X_CTRL_BASE + OMAP343X_CONTROL_MEM_WKUP\

						+ SCRATCHPAD_MEM_OFFS)

#define SDRC_POWER_V		OMAP34XX_SDRC_REGADDR(SDRC_POWER)



	.text
@@ -416,8 +415,6 @@ scratchpad_base: 
	.word	SCRATCHPAD_BASE_P

sdrc_power:

	.word SDRC_POWER_V

context_mem:

	.word	0x803E3E14

clk_stabilize_delay:

	.word 0x000001FF

assoc_mask: