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

Commit dccaad89 authored by Tero Kristo's avatar Tero Kristo Committed by Kevin Hilman
Browse files

OMAP3: PM: Force write last pad config register into save area 



Due to OMAP3 erratas 1.157, 1.185 the save of the last pad register
(ETK_D14 and ETK_D15) can fail sometimes when there is simultaneous
OCP access to the SCM register area. Fixed by writing the last
register to the save area.

Also, optimized the delay loop for the HW save to include an udelay(1),
which limits the number of unnecessary HW accesses to SCM register area
during the save.

Signed-off-by: default avatarTero Kristo <tero.kristo@nokia.com>
Acked-by: default avatarNishanth Menon <nm@ti.com>
Reviewed-by: default avatarAnand Gadiyar <gadiyar@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent 61b17d97

arch/arm/mach-omap2/pm34xx.c

+10 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/err.h>

#include <linux/gpio.h>

#include <linux/clk.h>

#include <linux/delay.h>



#include <plat/sram.h>

#include <plat/clockdomain.h>
@@ -126,7 +127,15 @@ static void omap3_core_save_context(void) 
	/* wait for the save to complete */

	while (!(omap_ctrl_readl(OMAP343X_CONTROL_GENERAL_PURPOSE_STATUS)

			& PADCONF_SAVE_DONE))

		;

		udelay(1);



	/*

	 * Force write last pad into memory, as this can fail in some

	 * cases according to erratas 1.157, 1.185

	 */

	omap_ctrl_writel(omap_ctrl_readl(OMAP343X_PADCONF_ETK_D14),

		OMAP343X_CONTROL_MEM_WKUP + 0x2a0);



	/* Save the Interrupt controller context */

	omap_intc_save_context();

	/* Save the GPMC context */