From: rmk+kernel@armlinux.org.uk (Russell King)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 5/8] ARM: sa1111: fix pcmcia interrupt mask polarity
Date: Tue, 06 Sep 2016 17:37:53 +0100 [thread overview]
Message-ID: <E1bhJNh-0008D8-OQ@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <20160906163711.GB1041@n2100.armlinux.org.uk>
The polarity of the high IRQs was being calculated using
SA1111_IRQMASK_HI(), but this assumes a Linux interrupt number, not a
hardware interrupt number. Hence, the resulting mask was incorrect.
Fix this.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
---
arch/arm/common/sa1111.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 332b92317fd8..cfa61b857cad 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -472,8 +472,8 @@ static int sa1111_setup_irq(struct sa1111 *sachip, unsigned irq_base)
* specifies that S0ReadyInt and S1ReadyInt should be '1'.
*/
sa1111_writel(0, irqbase + SA1111_INTPOL0);
- sa1111_writel(SA1111_IRQMASK_HI(IRQ_S0_READY_NINT) |
- SA1111_IRQMASK_HI(IRQ_S1_READY_NINT),
+ sa1111_writel(BIT(IRQ_S0_READY_NINT & 31) |
+ BIT(IRQ_S1_READY_NINT & 31),
irqbase + SA1111_INTPOL1);
/* clear all IRQs */
--
2.1.0
next prev parent reply other threads:[~2016-09-06 16:37 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-06 16:37 [PATCH 0/8] More SA11x0/PXA related fixes Russell King - ARM Linux
2016-09-06 16:37 ` [PATCH 1/8] pcmcia: sa1111: fix propagation of lowlevel board init return code Russell King
2016-09-06 16:37 ` [PATCH 2/8] pcmcia: lubbock: fix sockets configuration Russell King
2016-09-06 16:37 ` [PATCH 3/8] ARM: locomo: fix locomo irq handling Russell King
2016-09-06 16:37 ` [PATCH 4/8] ARM: sa1111: fix error code propagation in sa1111_probe() Russell King
2016-09-06 16:37 ` Russell King [this message]
2016-09-06 16:37 ` [PATCH 6/8] ARM: sa1111: fix pcmcia suspend/resume Russell King
2016-09-06 16:38 ` [PATCH 7/8] ARM: sa1111: fix missing clk_disable() Russell King
2016-09-06 16:38 ` [PATCH 8/8] ARM: pxa/lubbock: add pcmcia clock Russell King
2016-09-06 17:17 ` Robert Jarzmik
2016-09-07 9:10 ` Russell King - ARM Linux
2016-09-09 16:20 ` Robert Jarzmik
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=E1bhJNh-0008D8-OQ@rmk-PC.armlinux.org.uk \
--to=rmk+kernel@armlinux.org.uk \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.