From: "Stanley.Miao" <stanley.miao@windriver.com>
To: linux-omap@vger.kernel.org
Subject: [PATCH] OMAP3 PM: fix the error messages printed when the system suspend
Date: Tue, 22 Jun 2010 16:31:24 +0800 [thread overview]
Message-ID: <1277195484-5501-1-git-send-email-stanley.miao@windriver.com> (raw)
omap3505/omap3517 don't have the bit OMAP3430_EN_IO and the bit
OMAP3430_EN_IO_CHAIN in the register PM_WKEN_WKUP. When the system
suspend, the following messages will be printed:
"Wake up daisy chain activation failed."
Now fix it by adding "if (!cpu_is_omap3505() && !cpu_is_omap3517())".
Signed-off-by: Stanley.Miao <stanley.miao@windriver.com>
---
arch/arm/mach-omap2/pm34xx.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index 62529ff..d16648a 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -385,8 +385,9 @@ void omap_sram_idle(void)
/* Enable IO-PAD and IO-CHAIN wakeups */
per_next_state = pwrdm_read_next_pwrst(per_pwrdm);
core_next_state = pwrdm_read_next_pwrst(core_pwrdm);
- if (per_next_state < PWRDM_POWER_ON ||
- core_next_state < PWRDM_POWER_ON) {
+ if (!cpu_is_omap3505() && !cpu_is_omap3517() && \
+ (per_next_state < PWRDM_POWER_ON || \
+ core_next_state < PWRDM_POWER_ON)) {
prm_set_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD, PM_WKEN);
omap3_enable_io_chain();
}
@@ -479,7 +480,8 @@ void omap_sram_idle(void)
}
/* Disable IO-PAD and IO-CHAIN wakeup */
- if (core_next_state < PWRDM_POWER_ON) {
+ if ((core_next_state < PWRDM_POWER_ON) && \
+ !cpu_is_omap3505() && !cpu_is_omap3517()) {
prm_clear_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD, PM_WKEN);
omap3_disable_io_chain();
}
--
1.5.4.3
next reply other threads:[~2010-06-22 8:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-22 8:31 Stanley.Miao [this message]
2010-06-22 15:11 ` [PATCH] OMAP3 PM: fix the error messages printed when the system suspend Kevin Hilman
2010-08-09 21:29 ` Cliff Brake
2010-08-10 1:30 ` stanley.miao
2010-08-10 22:16 ` Cliff Brake
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=1277195484-5501-1-git-send-email-stanley.miao@windriver.com \
--to=stanley.miao@windriver.com \
--cc=linux-omap@vger.kernel.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).