linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: zumeng.chen@windriver.com (Zumeng Chen)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/3] Watchdog: Omap: get the bootstatus for OMAP2Plus
Date: Mon, 9 Jul 2012 12:39:39 +0800	[thread overview]
Message-ID: <1341808779-25532-4-git-send-email-zumeng.chen@windriver.com> (raw)
In-Reply-To: <1341808779-25532-1-git-send-email-zumeng.chen@windriver.com>

The offset of WKUP_MOD is not right for the PRM_RSTST of OMAP3. So here
put the right one to match to the actual physical addr 0x48307258, which
defined in PRCM Registers section.

And there is a MPU_WD_RST bit in PRM_RSTST(0x48307258) holding the signal
from omap-wdt reboot, so that we can return WDIOF_CARDRESET if the board
wakes up from omap-wdt reboot for WDIOC_GETBOOTSTATUS ioctl.

Signed-off-by: Zumeng Chen <zumeng.chen@windriver.com>
---
 arch/arm/mach-omap2/prcm.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c
index 480f40a..4dcc706 100644
--- a/arch/arm/mach-omap2/prcm.c
+++ b/arch/arm/mach-omap2/prcm.c
@@ -49,8 +49,11 @@ void __iomem *prcm_mpu_base;
 u32 omap_prcm_get_reset_sources(void)
 {
 	/* XXX This presumably needs modification for 34XX */
-	if (cpu_is_omap24xx() || cpu_is_omap34xx())
+	if (cpu_is_omap24xx())
 		return omap2_prm_read_mod_reg(WKUP_MOD, OMAP2_RM_RSTST) & 0x7f;
+	if (cpu_is_omap34xx())
+		return omap2_prm_read_mod_reg(OMAP3430_GR_MOD, OMAP2_RM_RSTST) &
+		       0x7f;
 	if (cpu_is_omap44xx())
 		return omap2_prm_read_mod_reg(WKUP_MOD, OMAP4_RM_RSTST) & 0x7f;
 
-- 
1.7.5.4

  parent reply	other threads:[~2012-07-09  4:39 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-09  4:39 [PATCH v2 0/2] Watchdog: OMAP: bootstatus fix for omap3 and changes for the current watchdog framework Zumeng Chen
2012-07-09  4:39 ` [PATCH 1/3] Watchdog: Omap: Changes for the new " Zumeng Chen
2012-07-09  4:39 ` [PATCH 2/3] Watchdog: Omap: select watchdog core for framework change Zumeng Chen
2012-07-09  4:39 ` Zumeng Chen [this message]
2012-07-09 16:40   ` [PATCH 3/3] Watchdog: Omap: get the bootstatus for OMAP2Plus Kevin Hilman
2012-07-10  0:34     ` Zumeng Chen
2012-07-09  4:46 ` [PATCH v2 0/2] Watchdog: OMAP: bootstatus fix for omap3 and changes for the current watchdog framework Zumeng Chen
2012-07-09  6:02 ` Vaibhav Hiremath
2012-07-09  6:00   ` Zumeng Chen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1341808779-25532-4-git-send-email-zumeng.chen@windriver.com \
    --to=zumeng.chen@windriver.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).