diff mbox

ARM: OMAP3: Fix HW SAVEANDRESTORE shift define

Message ID 1238568174-28291-2-git-send-email-kalle.jokiniemi@digia.com (mailing list archive)
State Accepted
Commit e2196a74ba4faeb272caef961b22e9ab982fb442
Headers show

Commit Message

Kalle Jokiniemi April 1, 2009, 6:42 a.m. UTC
The OMAP3430ES2_SAVEANDRESTORE_SHIFT macro is used
by powerdomain code in
"1 << OMAP3430ES2_SAVEANDRESTORE_SHIFT" manner, but
the definition was also (1 << 4), meaning we actually
modified bit 16. So the definition needs to be 4.

This fixes also a cold reset HW bug in OMAP3430 ES3.x
where some of the efuse bits are not isolated during
wake-up from off mode. This can cause randomish
cold resets with off mode. Enabling the USBTLL hardware
SAVEANDRESTORE causes the core power up assert to be
delayed in a way that we will not get faulty values
when boot ROM is reading the unisolated registers.

Signed-off-by: Kalle Jokiniemi <kalle.jokiniemi@digia.com>
---
 arch/arm/mach-omap2/prm-regbits-34xx.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Kevin Hilman April 1, 2009, 6:52 p.m. UTC | #1
Kalle Jokiniemi <kalle.jokiniemi@digia.com> writes:

> The OMAP3430ES2_SAVEANDRESTORE_SHIFT macro is used
> by powerdomain code in
> "1 << OMAP3430ES2_SAVEANDRESTORE_SHIFT" manner, but
> the definition was also (1 << 4), meaning we actually
> modified bit 16. So the definition needs to be 4.
>
> This fixes also a cold reset HW bug in OMAP3430 ES3.x
> where some of the efuse bits are not isolated during
> wake-up from off mode. This can cause randomish
> cold resets with off mode. Enabling the USBTLL hardware
> SAVEANDRESTORE causes the core power up assert to be
> delayed in a way that we will not get faulty values
> when boot ROM is reading the unisolated registers.
>
> Signed-off-by: Kalle Jokiniemi <kalle.jokiniemi@digia.com>

Acked-by: Kevin Hilman <khilman@deeprootsystems.com>

> ---
>  arch/arm/mach-omap2/prm-regbits-34xx.h |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/prm-regbits-34xx.h b/arch/arm/mach-omap2/prm-regbits-34xx.h
> index d73eee8..d792c29 100644
> --- a/arch/arm/mach-omap2/prm-regbits-34xx.h
> +++ b/arch/arm/mach-omap2/prm-regbits-34xx.h
> @@ -409,7 +409,7 @@
>  /* PM_PREPWSTST_CAM specific bits */
>  
>  /* PM_PWSTCTRL_USBHOST specific bits */
> -#define OMAP3430ES2_SAVEANDRESTORE_SHIFT		(1 << 4)
> +#define OMAP3430ES2_SAVEANDRESTORE_SHIFT		4
>  
>  /* RM_RSTST_PER specific bits */
>  
> -- 
> 1.5.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Paul Walmsley April 1, 2009, 7:05 p.m. UTC | #2
On Wed, 1 Apr 2009, Kalle Jokiniemi wrote:

> The OMAP3430ES2_SAVEANDRESTORE_SHIFT macro is used
> by powerdomain code in
> "1 << OMAP3430ES2_SAVEANDRESTORE_SHIFT" manner, but
> the definition was also (1 << 4), meaning we actually
> modified bit 16. So the definition needs to be 4.

Thanks Kalle, 

Acked-by: Paul Walmsley <paul@pwsan.com>

> diff --git a/arch/arm/mach-omap2/prm-regbits-34xx.h b/arch/arm/mach-omap2/prm-regbits-34xx.h
> index d73eee8..d792c29 100644
> --- a/arch/arm/mach-omap2/prm-regbits-34xx.h
> +++ b/arch/arm/mach-omap2/prm-regbits-34xx.h
> @@ -409,7 +409,7 @@
>  /* PM_PREPWSTST_CAM specific bits */
>  
>  /* PM_PWSTCTRL_USBHOST specific bits */
> -#define OMAP3430ES2_SAVEANDRESTORE_SHIFT		(1 << 4)
> +#define OMAP3430ES2_SAVEANDRESTORE_SHIFT		4
>  
>  /* RM_RSTST_PER specific bits */
>  
> -- 
> 1.5.4.3
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 


- Paul
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tony Lindgren May 14, 2009, 4:53 p.m. UTC | #3
This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Initial commit ID (Likely to change): e2196a74ba4faeb272caef961b22e9ab982fb442

PatchWorks
http://patchwork.kernel.org/patch/15586/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=e2196a74ba4faeb272caef961b22e9ab982fb442


--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/prm-regbits-34xx.h b/arch/arm/mach-omap2/prm-regbits-34xx.h
index d73eee8..d792c29 100644
--- a/arch/arm/mach-omap2/prm-regbits-34xx.h
+++ b/arch/arm/mach-omap2/prm-regbits-34xx.h
@@ -409,7 +409,7 @@ 
 /* PM_PREPWSTST_CAM specific bits */
 
 /* PM_PWSTCTRL_USBHOST specific bits */
-#define OMAP3430ES2_SAVEANDRESTORE_SHIFT		(1 << 4)
+#define OMAP3430ES2_SAVEANDRESTORE_SHIFT		4
 
 /* RM_RSTST_PER specific bits */