From: rnayak@ti.com (Rajendra Nayak)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: arch_timer: Don't expect both secure and nonsecure PPI IRQ info
Date: Fri, 18 Jan 2013 17:53:50 +0530 [thread overview]
Message-ID: <1358511830-7909-1-git-send-email-rnayak@ti.com> (raw)
The current logic expects platforms to pass information about *both*
secure and nonsecure PPI IRQ. Make arch_timer work even when either one
of those are provided instead.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
---
arch/arm/kernel/arch_timer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/kernel/arch_timer.c b/arch/arm/kernel/arch_timer.c
index c8ef207..59e1e26 100644
--- a/arch/arm/kernel/arch_timer.c
+++ b/arch/arm/kernel/arch_timer.c
@@ -495,7 +495,7 @@ int __init arch_timer_of_register(void)
if (!arch_timer_ppi[VIRT_PPI]) {
arch_timer_use_virtual = false;
- if (!arch_timer_ppi[PHYS_SECURE_PPI] ||
+ if (!arch_timer_ppi[PHYS_SECURE_PPI] &&
!arch_timer_ppi[PHYS_NONSECURE_PPI]) {
pr_warn("arch_timer: No interrupt available, giving up\n");
return -EINVAL;
--
1.7.9.5
next reply other threads:[~2013-01-18 12:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-18 12:23 Rajendra Nayak [this message]
2013-01-18 13:13 ` [PATCH] ARM: arch_timer: Don't expect both secure and nonsecure PPI IRQ info Marc Zyngier
2013-01-18 13:28 ` Rajendra Nayak
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=1358511830-7909-1-git-send-email-rnayak@ti.com \
--to=rnayak@ti.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