From: eric.y.miao@gmail.com (Eric Miao)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/6] [ARM] pxa/cm-x2xx: encode IRQ number into .nr_irqs
Date: Mon, 24 May 2010 14:35:49 +0800 [thread overview]
Message-ID: <1274682949-25915-7-git-send-email-eric.y.miao@gmail.com> (raw)
In-Reply-To: <1274682949-25915-1-git-send-email-eric.y.miao@gmail.com>
Cc: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
---
arch/arm/mach-pxa/cm-x2xx-pci.h | 6 ++++++
arch/arm/mach-pxa/cm-x2xx.c | 1 +
arch/arm/mach-pxa/include/mach/irqs.h | 11 -----------
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/arch/arm/mach-pxa/cm-x2xx-pci.h b/arch/arm/mach-pxa/cm-x2xx-pci.h
index e24aad2..9a87134 100644
--- a/arch/arm/mach-pxa/cm-x2xx-pci.h
+++ b/arch/arm/mach-pxa/cm-x2xx-pci.h
@@ -11,3 +11,9 @@ extern void __cmx2xx_pci_resume(void);
#define cmx2xx_pci_suspend(x) do {} while (0)
#define cmx2xx_pci_resume(x) do {} while (0)
#endif
+
+#ifdef CONFIG_PCI
+#define CMX2XX_NR_IRQS (IRQ_BOARD_START + 41)
+#else
+#define CMX2XX_NR_IRQS IRQ_BOARD_START
+#endif
diff --git a/arch/arm/mach-pxa/cm-x2xx.c b/arch/arm/mach-pxa/cm-x2xx.c
index bff6e78..d10b733 100644
--- a/arch/arm/mach-pxa/cm-x2xx.c
+++ b/arch/arm/mach-pxa/cm-x2xx.c
@@ -514,6 +514,7 @@ MACHINE_START(ARMCORE, "Compulab CM-X2XX")
.phys_io = 0x40000000,
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.map_io = cmx2xx_map_io,
+ .nr_irqs = CMX2XX_NR_IRQS,
.init_irq = cmx2xx_init_irq,
.timer = &pxa_timer,
.init_machine = cmx2xx_init,
diff --git a/arch/arm/mach-pxa/include/mach/irqs.h b/arch/arm/mach-pxa/include/mach/irqs.h
index 145fe1d..62d148c 100644
--- a/arch/arm/mach-pxa/include/mach/irqs.h
+++ b/arch/arm/mach-pxa/include/mach/irqs.h
@@ -138,15 +138,4 @@
#define NR_IRQS (IRQ_BOARD_START)
#endif
-/* add IT8152 IRQs beyond BOARD_END */
-#ifdef CONFIG_PCI_HOST_ITE8152
-#define IT8152_LAST_IRQ (IRQ_BOARD_END + 40)
-
-#if NR_IRQS < (IT8152_LAST_IRQ+1)
-#undef NR_IRQS
-#define NR_IRQS (IT8152_LAST_IRQ+1)
-#endif
-
-#endif /* CONFIG_PCI_HOST_ITE8152 */
-
#endif /* __ASM_MACH_IRQS_H */
--
1.7.0.4
next prev parent reply other threads:[~2010-05-24 6:35 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-24 6:35 [PATCH 0/6] pxa: encode IRQ number into .nr_irqs (SPARSE IRQ) Eric Miao
2010-05-24 6:35 ` [PATCH 1/6] [ARM] pxa: select SPARSE_IRQ by default Eric Miao
2010-05-24 6:35 ` [PATCH 2/6] [ARM] pxa: encode IRQ number into .nr_irqs Eric Miao
2010-05-24 6:35 ` [PATCH 3/6] [ARM] pxa/hx4700: " Eric Miao
2010-05-24 6:35 ` [PATCH 4/6] [ARM] pxa/ezx: " Eric Miao
2010-05-24 6:35 ` [PATCH 5/6] [ARM] pxa/balloon3: encode number of IRQ " Eric Miao
2010-05-24 6:35 ` Eric Miao [this message]
2010-05-24 7:33 ` [PATCH 6/6] [ARM] pxa/cm-x2xx: encode IRQ number " Mike Rapoport
2010-05-24 7:53 ` Eric Miao
2010-05-25 8:36 ` Mike Rapoport
2010-05-25 9:14 ` Eric Miao
2010-05-25 10:03 ` Mike Rapoport
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=1274682949-25915-7-git-send-email-eric.y.miao@gmail.com \
--to=eric.y.miao@gmail.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;
as well as URLs for NNTP newsgroup(s).