From: Zumeng Chen <zumeng.chen@windriver.com>
To: <khilman@ti.com>, <shubhrajyoti@ti.com>,
<linux-watchdog@vger.kernel.org>, <hvaibhav@ti.com>
Cc: <wim@iguana.be>, <linux-omap@vger.kernel.org>, <tony@atomide.com>,
<paul.gortmaker@windriver.com>,
<linux-arm-kernel@lists.infradead.org>
Subject: [PATCH RESEND v3 3/3] Watchdog: Omap: get the bootstatus for OMAP34xx
Date: Sun, 15 Jul 2012 15:44:06 +0800 [thread overview]
Message-ID: <1342338246-29101-4-git-send-email-zumeng.chen@windriver.com> (raw)
In-Reply-To: <1342338246-29101-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 named as Global_Reg_PRM.
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 | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c
index 480f40a..3ca8aa7 100644
--- a/arch/arm/mach-omap2/prcm.c
+++ b/arch/arm/mach-omap2/prcm.c
@@ -48,9 +48,14 @@ 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;
+
+ /* XXX This presumably needs modification for AM33XX when ready. */
+ 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
next prev parent reply other threads:[~2012-07-15 7:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-15 7:44 [PATCH RESEND V3 0/3] Watchdog: OMAP3: bootstatus fix and changes for the current watchdog framework Zumeng Chen
2012-07-15 7:44 ` [PATCH RESEND v3 1/3] Watchdog: Omap: Changes for the new " Zumeng Chen
2012-07-16 13:10 ` Hiremath, Vaibhav
2012-07-15 7:44 ` [PATCH RESEND v3 2/3] Watchdog: Omap: select watchdog core for framework change Zumeng Chen
2012-07-15 7:44 ` Zumeng Chen [this message]
2012-07-16 13:10 ` [PATCH RESEND V3 0/3] Watchdog: OMAP3: bootstatus fix and changes for the current watchdog framework Hiremath, Vaibhav
2012-07-16 14:55 ` 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=1342338246-29101-4-git-send-email-zumeng.chen@windriver.com \
--to=zumeng.chen@windriver.com \
--cc=hvaibhav@ti.com \
--cc=khilman@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=paul.gortmaker@windriver.com \
--cc=shubhrajyoti@ti.com \
--cc=tony@atomide.com \
--cc=wim@iguana.be \
/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).