From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/3] integrator: fix the IRQ masks on the Integrator/CP
Date: Wed, 11 Apr 2012 23:56:51 +0100 [thread overview]
Message-ID: <20120411225651.GD24211@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <1334184223-18864-1-git-send-email-linus.walleij@linaro.org>
On Thu, Apr 12, 2012 at 12:43:43AM +0200, Linus Walleij wrote:
> diff --git a/arch/arm/mach-integrator/include/mach/irqs.h b/arch/arm/mach-integrator/include/mach/irqs.h
> index a19a1a2..283931e 100644
> --- a/arch/arm/mach-integrator/include/mach/irqs.h
> +++ b/arch/arm/mach-integrator/include/mach/irqs.h
> @@ -52,7 +52,7 @@
> #define IRQ_CP_CPPLDINT 26
> #define IRQ_CP_ETHINT 27
> #define IRQ_CP_TSPENINT 28
> -#define IRQ_PIC_END 31
> +#define IRQ_PIC_END 28
>
> #define IRQ_CIC_START 32
> #define IRQ_CM_SOFTINT 32
> diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
> index 48a115a..2172f4c 100644
> --- a/arch/arm/mach-integrator/integrator_cp.c
> +++ b/arch/arm/mach-integrator/integrator_cp.c
> @@ -163,10 +163,10 @@ static struct fpga_irq_data sic_irq_data = {
>
> static void __init intcp_init_irq(void)
> {
> - u32 pic_mask, sic_mask;
> + u32 pic_mask, cic_mask, sic_mask;
>
> - pic_mask = ~((~0u) << (11 - IRQ_PIC_START));
> - pic_mask |= (~((~0u) << (29 - 22))) << 22;
> + pic_mask = ~((~0u) << (1 + IRQ_PIC_END - IRQ_PIC_START));
Err no, the original is correct.
Integrator/CP only has IRQs 29-22 and IRQs 11-0. IRQs 21-12 are
reserved. Integrator/AP on the other hand has IRQs 21-0.
next prev parent reply other threads:[~2012-04-11 22:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-11 22:43 [PATCH 1/3] integrator: fix the IRQ masks on the Integrator/CP Linus Walleij
2012-04-11 22:56 ` Russell King - ARM Linux [this message]
2012-04-11 23:07 ` Linus Walleij
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=20120411225651.GD24211@n2100.arm.linux.org.uk \
--to=linux@arm.linux.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox