* [PATCH 1/6] [ARM] pxa: select SPARSE_IRQ by default
2010-05-24 6:35 [PATCH 0/6] pxa: encode IRQ number into .nr_irqs (SPARSE IRQ) Eric Miao
@ 2010-05-24 6:35 ` Eric Miao
2010-05-24 6:35 ` [PATCH 2/6] [ARM] pxa: encode IRQ number into .nr_irqs Eric Miao
` (4 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Eric Miao @ 2010-05-24 6:35 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
---
arch/arm/Kconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 02df4fd..dece838 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -579,6 +579,7 @@ config ARCH_PXA
select GENERIC_CLOCKEVENTS
select TICK_ONESHOT
select PLAT_PXA
+ select SPARSE_IRQ
help
Support for Intel/Marvell's PXA2xx/PXA3xx processor line.
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 2/6] [ARM] pxa: encode IRQ number into .nr_irqs
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 ` Eric Miao
2010-05-24 6:35 ` [PATCH 3/6] [ARM] pxa/hx4700: " Eric Miao
` (3 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Eric Miao @ 2010-05-24 6:35 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
---
arch/arm/mach-pxa/Kconfig | 5 -----
arch/arm/mach-pxa/include/mach/irqs.h | 7 +------
arch/arm/mach-pxa/include/mach/lpd270.h | 1 +
arch/arm/mach-pxa/include/mach/lubbock.h | 3 +++
arch/arm/mach-pxa/include/mach/mainstone.h | 2 ++
arch/arm/mach-pxa/include/mach/poodle.h | 2 ++
arch/arm/mach-pxa/include/mach/zylonite.h | 2 ++
arch/arm/mach-pxa/lpd270.c | 1 +
arch/arm/mach-pxa/lubbock.c | 3 ++-
arch/arm/mach-pxa/mainstone.c | 1 +
arch/arm/mach-pxa/poodle.c | 1 +
arch/arm/mach-pxa/zylonite.c | 1 +
12 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 3b51741..bf49135 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -8,19 +8,16 @@ config ARCH_LUBBOCK
bool "Intel DBPXA250 Development Platform (aka Lubbock)"
select PXA25x
select SA1111
- select PXA_HAVE_BOARD_IRQS
config MACH_MAINSTONE
bool "Intel HCDDBBVA0 Development Platform (aka Mainstone)"
select PXA27x
select HAVE_PWM
- select PXA_HAVE_BOARD_IRQS
config MACH_ZYLONITE
bool
select PXA3xx
select HAVE_PWM
- select PXA_HAVE_BOARD_IRQS
config MACH_ZYLONITE300
bool "PXA3xx Development Platform (aka Zylonite) PXA300/310"
@@ -206,7 +203,6 @@ config MACH_LOGICPD_PXA270
bool "LogicPD PXA270 Card Engine Development Platform"
select PXA27x
select HAVE_PWM
- select PXA_HAVE_BOARD_IRQS
config MACH_PCM027
bool "Phytec phyCORE-PXA270 CPU module (PCM-027)"
@@ -463,7 +459,6 @@ config MACH_POODLE
depends on PXA_SHARPSL
select PXA25x
select SHARP_LOCOMO
- select PXA_HAVE_BOARD_IRQS
config MACH_CORGI
bool "Enable Sharp SL-C700 (Corgi) Support"
diff --git a/arch/arm/mach-pxa/include/mach/irqs.h b/arch/arm/mach-pxa/include/mach/irqs.h
index ffc8314..3b3b245 100644
--- a/arch/arm/mach-pxa/include/mach/irqs.h
+++ b/arch/arm/mach-pxa/include/mach/irqs.h
@@ -127,8 +127,6 @@
#if defined(CONFIG_MACH_H4700)
#define IRQ_BOARD_END (IRQ_BOARD_START + 70)
-#elif defined(CONFIG_MACH_ZYLONITE)
-#define IRQ_BOARD_END (IRQ_BOARD_START + 32)
#elif defined(CONFIG_PXA_EZX)
#define IRQ_BOARD_END (IRQ_BOARD_START + 23)
#else
@@ -138,13 +136,10 @@
/*
* Figure out the MAX IRQ number.
*
- * If we have an SA1111, the max IRQ is S1_BVD1_STSCHG+1.
* If we have an LoCoMo, the max IRQ is IRQ_LOCOMO_SPI_TEND+1
* Otherwise, we have the standard IRQs only.
*/
-#ifdef CONFIG_SA1111
-#define NR_IRQS (IRQ_BOARD_END + 55)
-#elif defined(CONFIG_PXA_HAVE_BOARD_IRQS)
+#if defined(CONFIG_PXA_HAVE_BOARD_IRQS)
#define NR_IRQS (IRQ_BOARD_END)
#else
#define NR_IRQS (IRQ_BOARD_START)
diff --git a/arch/arm/mach-pxa/include/mach/lpd270.h b/arch/arm/mach-pxa/include/mach/lpd270.h
index 0e6440c..cd07009 100644
--- a/arch/arm/mach-pxa/include/mach/lpd270.h
+++ b/arch/arm/mach-pxa/include/mach/lpd270.h
@@ -38,5 +38,6 @@
#define LPD270_USBC_IRQ LPD270_IRQ(2)
#define LPD270_ETHERNET_IRQ LPD270_IRQ(3)
#define LPD270_AC97_IRQ LPD270_IRQ(4)
+#define LPD270_NR_IRQS (IRQ_BOARD_START + 5)
#endif
diff --git a/arch/arm/mach-pxa/include/mach/lubbock.h b/arch/arm/mach-pxa/include/mach/lubbock.h
index a0d4247..2a086e8 100644
--- a/arch/arm/mach-pxa/include/mach/lubbock.h
+++ b/arch/arm/mach-pxa/include/mach/lubbock.h
@@ -45,6 +45,9 @@
#define LUBBOCK_USB_DISC_IRQ LUBBOCK_IRQ(6) /* usb disconnect */
#define LUBBOCK_LAST_IRQ LUBBOCK_IRQ(6)
+#define LUBBOCK_SA1111_IRQ_BASE (IRQ_BOARD_START + 16)
+#define LUBBOCK_NR_IRQS (IRQ_BOARD_START + 16 + 55)
+
#ifndef __ASSEMBLY__
extern void lubbock_set_misc_wr(unsigned int mask, unsigned int set);
#endif
diff --git a/arch/arm/mach-pxa/include/mach/mainstone.h b/arch/arm/mach-pxa/include/mach/mainstone.h
index 86e623a..4c2d11c 100644
--- a/arch/arm/mach-pxa/include/mach/mainstone.h
+++ b/arch/arm/mach-pxa/include/mach/mainstone.h
@@ -134,4 +134,6 @@
#define MAINSTONE_S1_STSCHG_IRQ MAINSTONE_IRQ(14)
#define MAINSTONE_S1_IRQ MAINSTONE_IRQ(15)
+#define MAINSTONE_NR_IRQS (IRQ_BOARD_START + 16)
+
#endif
diff --git a/arch/arm/mach-pxa/include/mach/poodle.h b/arch/arm/mach-pxa/include/mach/poodle.h
index 0b3e6d0..83d1cfd 100644
--- a/arch/arm/mach-pxa/include/mach/poodle.h
+++ b/arch/arm/mach-pxa/include/mach/poodle.h
@@ -85,6 +85,8 @@
#define POODLE_LOCOMO_GPIO_232VCC_ON LOCOMO_GPIO(12)
#define POODLE_LOCOMO_GPIO_JK_B LOCOMO_GPIO(13)
+#define POODLE_NR_IRQS (IRQ_BOARD_START + 4) /* 4 for LoCoMo */
+
extern struct platform_device poodle_locomo_device;
#endif /* __ASM_ARCH_POODLE_H */
diff --git a/arch/arm/mach-pxa/include/mach/zylonite.h b/arch/arm/mach-pxa/include/mach/zylonite.h
index 9edf645..ea24998 100644
--- a/arch/arm/mach-pxa/include/mach/zylonite.h
+++ b/arch/arm/mach-pxa/include/mach/zylonite.h
@@ -5,6 +5,8 @@
#define EXT_GPIO(x) (128 + (x))
+#define ZYLONITE_NR_IRQS (IRQ_BOARD_START + 32)
+
/* the following variables are processor specific and initialized
* by the corresponding zylonite_pxa3xx_init()
*/
diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c
index d279507..fc9502e 100644
--- a/arch/arm/mach-pxa/lpd270.c
+++ b/arch/arm/mach-pxa/lpd270.c
@@ -509,6 +509,7 @@ MACHINE_START(LOGICPD_PXA270, "LogicPD PXA270 Card Engine")
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.boot_params = 0xa0000100,
.map_io = lpd270_map_io,
+ .nr_irqs = LPD270_NR_IRQS,
.init_irq = lpd270_init_irq,
.timer = &pxa_timer,
.init_machine = lpd270_init,
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index 330c328..1956c23 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -229,7 +229,7 @@ static struct resource sa1111_resources[] = {
};
static struct sa1111_platform_data sa1111_info = {
- .irq_base = IRQ_BOARD_END,
+ .irq_base = LUBBOCK_SA1111_IRQ_BASE,
};
static struct platform_device sa1111_device = {
@@ -560,6 +560,7 @@ MACHINE_START(LUBBOCK, "Intel DBPXA250 Development Platform (aka Lubbock)")
.phys_io = 0x40000000,
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.map_io = lubbock_map_io,
+ .nr_irqs = LUBBOCK_NR_IRQS,
.init_irq = lubbock_init_irq,
.timer = &pxa_timer,
.init_machine = lubbock_init,
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index 5543c64..c2a8717 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -628,6 +628,7 @@ MACHINE_START(MAINSTONE, "Intel HCDDBBVA0 Development Platform (aka Mainstone)")
.boot_params = 0xa0000100, /* BLOB boot parameter setting */
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.map_io = mainstone_map_io,
+ .nr_irqs = MAINSTONE_NR_IRQS,
.init_irq = mainstone_init_irq,
.timer = &pxa_timer,
.init_machine = mainstone_init,
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index f4abdaa..aef6a9e 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -472,6 +472,7 @@ MACHINE_START(POODLE, "SHARP Poodle")
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.fixup = fixup_poodle,
.map_io = pxa_map_io,
+ .nr_irqs = POODLE_NR_IRQS, /* 4 for LoCoMo */
.init_irq = pxa25x_init_irq,
.timer = &pxa_timer,
.init_machine = poodle_init,
diff --git a/arch/arm/mach-pxa/zylonite.c b/arch/arm/mach-pxa/zylonite.c
index c479cbe..2edad61 100644
--- a/arch/arm/mach-pxa/zylonite.c
+++ b/arch/arm/mach-pxa/zylonite.c
@@ -415,6 +415,7 @@ MACHINE_START(ZYLONITE, "PXA3xx Platform Development Kit (aka Zylonite)")
.boot_params = 0xa0000100,
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.map_io = pxa_map_io,
+ .nr_irqs = ZYLONITE_NR_IRQS,
.init_irq = pxa3xx_init_irq,
.timer = &pxa_timer,
.init_machine = zylonite_init,
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 3/6] [ARM] pxa/hx4700: encode IRQ number into .nr_irqs
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 ` Eric Miao
2010-05-24 6:35 ` [PATCH 4/6] [ARM] pxa/ezx: " Eric Miao
` (2 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Eric Miao @ 2010-05-24 6:35 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
---
arch/arm/mach-pxa/Kconfig | 1 -
arch/arm/mach-pxa/hx4700.c | 1 +
arch/arm/mach-pxa/include/mach/hx4700.h | 4 ++++
arch/arm/mach-pxa/include/mach/irqs.h | 4 +---
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index bf49135..32b1fd2 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -259,7 +259,6 @@ config MACH_H4700
select PXA27x
select IWMMXT
select HAVE_PWM
- select PXA_HAVE_BOARD_IRQS
config MACH_H5000
bool "HP iPAQ h5000"
diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c
index 848c861..10104f1 100644
--- a/arch/arm/mach-pxa/hx4700.c
+++ b/arch/arm/mach-pxa/hx4700.c
@@ -874,6 +874,7 @@ MACHINE_START(H4700, "HP iPAQ HX4700")
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.boot_params = 0xa0000100,
.map_io = pxa_map_io,
+ .nr_irqs = HX4700_NR_IRQS,
.init_irq = pxa27x_init_irq,
.init_machine = hx4700_init,
.timer = &pxa_timer,
diff --git a/arch/arm/mach-pxa/include/mach/hx4700.h b/arch/arm/mach-pxa/include/mach/hx4700.h
index 9eaeed1..862a190 100644
--- a/arch/arm/mach-pxa/include/mach/hx4700.h
+++ b/arch/arm/mach-pxa/include/mach/hx4700.h
@@ -128,4 +128,8 @@
#define EGPIO7_VCC_3V3_WL_EN (HX4700_EGPIO_BASE + 7) /* WLAN 3.3V enable */
#define EGPIO8_USB_3V3_ON (HX4700_EGPIO_BASE + 8) /* unused */
+/*
+ * IRQs
+ */
+#define HX4700_NR_IRQS (IRQ_BOARD_START + 70) /* ASIC3 */
#endif /* _HX4700_H_ */
diff --git a/arch/arm/mach-pxa/include/mach/irqs.h b/arch/arm/mach-pxa/include/mach/irqs.h
index 3b3b245..169567c 100644
--- a/arch/arm/mach-pxa/include/mach/irqs.h
+++ b/arch/arm/mach-pxa/include/mach/irqs.h
@@ -125,9 +125,7 @@
*/
#define IRQ_BOARD_START (PXA_GPIO_IRQ_BASE + PXA_GPIO_IRQ_NUM)
-#if defined(CONFIG_MACH_H4700)
-#define IRQ_BOARD_END (IRQ_BOARD_START + 70)
-#elif defined(CONFIG_PXA_EZX)
+#if defined(CONFIG_PXA_EZX)
#define IRQ_BOARD_END (IRQ_BOARD_START + 23)
#else
#define IRQ_BOARD_END (IRQ_BOARD_START + 16)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 4/6] [ARM] pxa/ezx: encode IRQ number into .nr_irqs
2010-05-24 6:35 [PATCH 0/6] pxa: encode IRQ number into .nr_irqs (SPARSE IRQ) Eric Miao
` (2 preceding siblings ...)
2010-05-24 6:35 ` [PATCH 3/6] [ARM] pxa/hx4700: " Eric Miao
@ 2010-05-24 6:35 ` Eric Miao
2010-05-24 6:35 ` [PATCH 5/6] [ARM] pxa/balloon3: encode number of IRQ " Eric Miao
2010-05-24 6:35 ` [PATCH 6/6] [ARM] pxa/cm-x2xx: encode IRQ number " Eric Miao
5 siblings, 0 replies; 12+ messages in thread
From: Eric Miao @ 2010-05-24 6:35 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Daniel Ribeiro <drwyrm@gmail.com>
Cc: Stefan Schmidt <stefan@openezx.org>
Cc: Harald Welte <laforge@openezx.org>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
---
arch/arm/mach-pxa/Kconfig | 1 -
arch/arm/mach-pxa/ezx.c | 8 ++++++++
arch/arm/mach-pxa/include/mach/irqs.h | 5 -----
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 32b1fd2..60b3c17 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -291,7 +291,6 @@ config PXA_EZX
select PXA27x
select IWMMXT
select HAVE_PWM
- select PXA_HAVE_BOARD_IRQS
config MACH_EZX_A780
bool "Motorola EZX A780"
diff --git a/arch/arm/mach-pxa/ezx.c b/arch/arm/mach-pxa/ezx.c
index 626c82b..3d9cf20 100644
--- a/arch/arm/mach-pxa/ezx.c
+++ b/arch/arm/mach-pxa/ezx.c
@@ -47,6 +47,8 @@
#define GPIO19_GEN1_CAM_RST 19
#define GPIO28_GEN2_CAM_RST 28
+#define EZX_NR_IRQS (IRQ_BOARD_START + 23)
+
static struct platform_pwm_backlight_data ezx_backlight_data = {
.pwm_id = 0,
.max_brightness = 1023,
@@ -800,6 +802,7 @@ MACHINE_START(EZX_A780, "Motorola EZX A780")
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.boot_params = 0xa0000100,
.map_io = pxa_map_io,
+ .nr_irqs = EZX_NR_IRQS,
.init_irq = pxa27x_init_irq,
.timer = &pxa_timer,
.init_machine = a780_init,
@@ -866,6 +869,7 @@ MACHINE_START(EZX_E680, "Motorola EZX E680")
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.boot_params = 0xa0000100,
.map_io = pxa_map_io,
+ .nr_irqs = EZX_NR_IRQS,
.init_irq = pxa27x_init_irq,
.timer = &pxa_timer,
.init_machine = e680_init,
@@ -932,6 +936,7 @@ MACHINE_START(EZX_A1200, "Motorola EZX A1200")
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.boot_params = 0xa0000100,
.map_io = pxa_map_io,
+ .nr_irqs = EZX_NR_IRQS,
.init_irq = pxa27x_init_irq,
.timer = &pxa_timer,
.init_machine = a1200_init,
@@ -1124,6 +1129,7 @@ MACHINE_START(EZX_A910, "Motorola EZX A910")
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.boot_params = 0xa0000100,
.map_io = pxa_map_io,
+ .nr_irqs = EZX_NR_IRQS,
.init_irq = pxa27x_init_irq,
.timer = &pxa_timer,
.init_machine = a910_init,
@@ -1190,6 +1196,7 @@ MACHINE_START(EZX_E6, "Motorola EZX E6")
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.boot_params = 0xa0000100,
.map_io = pxa_map_io,
+ .nr_irqs = EZX_NR_IRQS,
.init_irq = pxa27x_init_irq,
.timer = &pxa_timer,
.init_machine = e6_init,
@@ -1230,6 +1237,7 @@ MACHINE_START(EZX_E2, "Motorola EZX E2")
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.boot_params = 0xa0000100,
.map_io = pxa_map_io,
+ .nr_irqs = EZX_NR_IRQS,
.init_irq = pxa27x_init_irq,
.timer = &pxa_timer,
.init_machine = e2_init,
diff --git a/arch/arm/mach-pxa/include/mach/irqs.h b/arch/arm/mach-pxa/include/mach/irqs.h
index 169567c..145fe1d 100644
--- a/arch/arm/mach-pxa/include/mach/irqs.h
+++ b/arch/arm/mach-pxa/include/mach/irqs.h
@@ -124,12 +124,7 @@
* used.
*/
#define IRQ_BOARD_START (PXA_GPIO_IRQ_BASE + PXA_GPIO_IRQ_NUM)
-
-#if defined(CONFIG_PXA_EZX)
-#define IRQ_BOARD_END (IRQ_BOARD_START + 23)
-#else
#define IRQ_BOARD_END (IRQ_BOARD_START + 16)
-#endif
/*
* Figure out the MAX IRQ number.
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 5/6] [ARM] pxa/balloon3: encode number of IRQ into .nr_irqs
2010-05-24 6:35 [PATCH 0/6] pxa: encode IRQ number into .nr_irqs (SPARSE IRQ) Eric Miao
` (3 preceding siblings ...)
2010-05-24 6:35 ` [PATCH 4/6] [ARM] pxa/ezx: " Eric Miao
@ 2010-05-24 6:35 ` Eric Miao
2010-05-24 6:35 ` [PATCH 6/6] [ARM] pxa/cm-x2xx: encode IRQ number " Eric Miao
5 siblings, 0 replies; 12+ messages in thread
From: Eric Miao @ 2010-05-24 6:35 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Jonathan McDowell <noodles@earth.li>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
---
arch/arm/mach-pxa/Kconfig | 1 -
arch/arm/mach-pxa/balloon3.c | 1 +
arch/arm/mach-pxa/include/mach/balloon3.h | 1 +
3 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 60b3c17..3378c79 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -74,7 +74,6 @@ config MACH_BALLOON3
bool "Balloon 3 board"
select PXA27x
select IWMMXT
- select PXA_HAVE_BOARD_IRQS
config MACH_CSB726
bool "Enable Cogent CSB726 System On a Module"
diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c
index f3b5ace..c9a50b3 100644
--- a/arch/arm/mach-pxa/balloon3.c
+++ b/arch/arm/mach-pxa/balloon3.c
@@ -349,6 +349,7 @@ MACHINE_START(BALLOON3, "Balloon3")
.phys_io = 0x40000000,
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.map_io = balloon3_map_io,
+ .nr_irqs = BALLOON3_NR_IRQS,
.init_irq = balloon3_init_irq,
.timer = &pxa_timer,
.init_machine = balloon3_init,
diff --git a/arch/arm/mach-pxa/include/mach/balloon3.h b/arch/arm/mach-pxa/include/mach/balloon3.h
index 1a74106..1b76a00 100644
--- a/arch/arm/mach-pxa/include/mach/balloon3.h
+++ b/arch/arm/mach-pxa/include/mach/balloon3.h
@@ -131,6 +131,7 @@ enum balloon3_features {
/* Balloon3 Interrupts */
#define BALLOON3_IRQ(x) (IRQ_BOARD_START + (x))
+#define BALLOON3_NR_IRQS (IRQ_BOARD_START + 8)
#define BALLOON3_BP_CF_NRDY_IRQ BALLOON3_IRQ(0)
#define BALLOON3_BP_NSTSCHG_IRQ BALLOON3_IRQ(1)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 6/6] [ARM] pxa/cm-x2xx: encode IRQ number into .nr_irqs
2010-05-24 6:35 [PATCH 0/6] pxa: encode IRQ number into .nr_irqs (SPARSE IRQ) Eric Miao
` (4 preceding siblings ...)
2010-05-24 6:35 ` [PATCH 5/6] [ARM] pxa/balloon3: encode number of IRQ " Eric Miao
@ 2010-05-24 6:35 ` Eric Miao
2010-05-24 7:33 ` Mike Rapoport
5 siblings, 1 reply; 12+ messages in thread
From: Eric Miao @ 2010-05-24 6:35 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 6/6] [ARM] pxa/cm-x2xx: encode IRQ number into .nr_irqs
2010-05-24 6:35 ` [PATCH 6/6] [ARM] pxa/cm-x2xx: encode IRQ number " Eric Miao
@ 2010-05-24 7:33 ` Mike Rapoport
2010-05-24 7:53 ` Eric Miao
0 siblings, 1 reply; 12+ messages in thread
From: Mike Rapoport @ 2010-05-24 7:33 UTC (permalink / raw)
To: linux-arm-kernel
Hi Eric,
Eric Miao wrote:
> 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(-)
Looks Ok to me. Do you have a tree I can pull to test your changes?
> 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 */
--
Sincerely yours,
Mike.
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 6/6] [ARM] pxa/cm-x2xx: encode IRQ number into .nr_irqs
2010-05-24 7:33 ` Mike Rapoport
@ 2010-05-24 7:53 ` Eric Miao
2010-05-25 8:36 ` Mike Rapoport
0 siblings, 1 reply; 12+ messages in thread
From: Eric Miao @ 2010-05-24 7:53 UTC (permalink / raw)
To: linux-arm-kernel
Should be in my irq_cleanup branch, test welcome
On May 24, 2010 3:34 PM, "Mike Rapoport" <mike@compulab.co.il> wrote:
Hi Eric,
Eric Miao wrote:
>
> Cc: Mike Rapoport <mike@compulab.co.il>
> Signed-off-by: Eric Miao <eric.y.mi...
Looks Ok to me. Do you have a tree I can pull to test your changes?
> diff --git a/arch/arm/mach-pxa/cm-x2xx-pci.h
b/arch/arm/mach-pxa/cm-x2xx-pci.h
> index e24aad2.....
Sincerely yours,
Mike.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100524/246da28a/attachment.htm>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 6/6] [ARM] pxa/cm-x2xx: encode IRQ number into .nr_irqs
2010-05-24 7:53 ` Eric Miao
@ 2010-05-25 8:36 ` Mike Rapoport
2010-05-25 9:14 ` Eric Miao
0 siblings, 1 reply; 12+ messages in thread
From: Mike Rapoport @ 2010-05-25 8:36 UTC (permalink / raw)
To: linux-arm-kernel
Hi Eric,
Eric Miao wrote:
> Should be in my irq_cleanup branch, test welcome
works with the below patch on top your irq_cleanup branch:
-
From: Mike Rapoport <mike@compulab.co.il>
Date: Tue, 25 May 2010 11:28:08 +0300
Subject: [PATCH] [ARM] it8152: update interrupts numbering to work with
sparse irqs
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
---
arch/arm/include/asm/hardware/it8152.h | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/arm/include/asm/hardware/it8152.h
b/arch/arm/include/asm/hardware/it8152.h
index 6700c7f..b2f95c7 100644
--- a/arch/arm/include/asm/hardware/it8152.h
+++ b/arch/arm/include/asm/hardware/it8152.h
@@ -75,7 +75,8 @@ extern unsigned long it8152_base_address;
IT8152_PD_IRQ(1) USB (USBR)
IT8152_PD_IRQ(0) Audio controller (ACR)
*/
-#define IT8152_IRQ(x) (IRQ_BOARD_END + (x))
+#define IT8152_IRQ(x) (IRQ_BOARD_START + (x))
+#define IT8152_LAST_IRQ (IRQ_BOARD_START + 40)
/* IRQ-sources in 3 groups - local devices, LPC (serial), and external
PCI */
#define IT8152_LD_IRQ_COUNT 9
--
1.6.4.4
>> On May 24, 2010 3:34 PM, "Mike Rapoport" <mike@compulab.co.il
>> <mailto:mike@compulab.co.il>> wrote:
>>
>> Hi Eric,
>>
>>
>>
>> Eric Miao wrote:
>> >
>> > Cc: Mike Rapoport <mike at compulab.co.il <mailto:mike@compulab.co.il>>
>> > Signed-off-by: Eric Miao <eric.y.mi...
>>
>> Looks Ok to me. Do you have a tree I can pull to test your changes?
>>
>>
>>
>> > diff --git a/arch/arm/mach-pxa/cm-x2xx-pci.h
>> b/arch/arm/mach-pxa/cm-x2xx-pci.h
>> > index e24aad2.....
>>
>> Sincerely yours,
>> Mike.
>
--
Sincerely yours,
Mike.
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: 0001-ARM-it8152-update-interrupts-numbering-to-work-with-.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100525/48b3b51a/attachment.el>
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 6/6] [ARM] pxa/cm-x2xx: encode IRQ number into .nr_irqs
2010-05-25 8:36 ` Mike Rapoport
@ 2010-05-25 9:14 ` Eric Miao
2010-05-25 10:03 ` Mike Rapoport
0 siblings, 1 reply; 12+ messages in thread
From: Eric Miao @ 2010-05-25 9:14 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, May 25, 2010 at 4:36 PM, Mike Rapoport <mike@compulab.co.il> wrote:
> Hi Eric,
>
> Eric Miao wrote:
>>
>> Should be in my irq_cleanup branch, test welcome
>
> works with the below patch on top your irq_cleanup branch:
>
Thanks Mike, looks like a fix. You mind if I merge this into the previous patch
with your Signed-off-by?
> -
> From: Mike Rapoport <mike@compulab.co.il>
> Date: Tue, 25 May 2010 11:28:08 +0300
> Subject: [PATCH] [ARM] it8152: update interrupts numbering to work with
> sparse irqs
>
> Signed-off-by: Mike Rapoport <mike@compulab.co.il>
> ---
> ?arch/arm/include/asm/hardware/it8152.h | ? ?3 ++-
> ?1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/include/asm/hardware/it8152.h
> b/arch/arm/include/asm/hardware/it8152.h
> index 6700c7f..b2f95c7 100644
> --- a/arch/arm/include/asm/hardware/it8152.h
> +++ b/arch/arm/include/asm/hardware/it8152.h
> @@ -75,7 +75,8 @@ extern unsigned long it8152_base_address;
> ? IT8152_PD_IRQ(1) ?USB (USBR)
> ? IT8152_PD_IRQ(0) ?Audio controller (ACR)
> ?*/
> -#define IT8152_IRQ(x) ? (IRQ_BOARD_END + (x))
> +#define IT8152_IRQ(x) ? (IRQ_BOARD_START + (x))
> +#define IT8152_LAST_IRQ ? ? ? ?(IRQ_BOARD_START + 40)
>
> ?/* IRQ-sources in 3 groups - local devices, LPC (serial), and external PCI
> */
> ?#define IT8152_LD_IRQ_COUNT ? ? 9
> --
> 1.6.4.4
>
>>> On May 24, 2010 3:34 PM, "Mike Rapoport" <mike@compulab.co.il
>>> <mailto:mike@compulab.co.il>> wrote:
>>>
>>> Hi Eric,
>>>
>>>
>>>
>>> Eric Miao wrote:
>>> >
>>> > Cc: Mike Rapoport <mike at compulab.co.il <mailto:mike@compulab.co.il>>
>>> > Signed-off-by: Eric Miao <eric.y.mi...
>>>
>>> Looks Ok to me. Do you have a tree I can pull to test your changes?
>>>
>>>
>>>
>>> > diff --git a/arch/arm/mach-pxa/cm-x2xx-pci.h
>>> > b/arch/arm/mach-pxa/cm-x2xx-pci.h
>>> > index e24aad2.....
>>>
>>> Sincerely yours,
>>> Mike.
>>
>
>
> --
> Sincerely yours,
> Mike.
>
>
> From ec3ae629d9844ea5f6d7588ca7451377e640a960 Mon Sep 17 00:00:00 2001
> From: Mike Rapoport <mike@compulab.co.il>
> Date: Tue, 25 May 2010 11:28:08 +0300
> Subject: [PATCH] [ARM] it8152: update interrupts numbering to work with
> sparse irqs
>
> Signed-off-by: Mike Rapoport <mike@compulab.co.il>
> ---
> ?arch/arm/include/asm/hardware/it8152.h | ? ?3 ++-
> ?1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/include/asm/hardware/it8152.h
> b/arch/arm/include/asm/hardware/it8152.h
> index 6700c7f..b2f95c7 100644
> --- a/arch/arm/include/asm/hardware/it8152.h
> +++ b/arch/arm/include/asm/hardware/it8152.h
> @@ -75,7 +75,8 @@ extern unsigned long it8152_base_address;
> ? IT8152_PD_IRQ(1) ?USB (USBR)
> ? IT8152_PD_IRQ(0) ?Audio controller (ACR)
> ?*/
> -#define IT8152_IRQ(x) ? (IRQ_BOARD_END + (x))
> +#define IT8152_IRQ(x) ? (IRQ_BOARD_START + (x))
> +#define IT8152_LAST_IRQ ? ? ? ?(IRQ_BOARD_START + 40)
>
> ?/* IRQ-sources in 3 groups - local devices, LPC (serial), and external PCI
> */
> ?#define IT8152_LD_IRQ_COUNT ? ? 9
> --
> 1.6.4.4
>
>
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 6/6] [ARM] pxa/cm-x2xx: encode IRQ number into .nr_irqs
2010-05-25 9:14 ` Eric Miao
@ 2010-05-25 10:03 ` Mike Rapoport
0 siblings, 0 replies; 12+ messages in thread
From: Mike Rapoport @ 2010-05-25 10:03 UTC (permalink / raw)
To: linux-arm-kernel
Eric Miao wrote:
> On Tue, May 25, 2010 at 4:36 PM, Mike Rapoport <mike@compulab.co.il> wrote:
>> Hi Eric,
>>
>> Eric Miao wrote:
>>> Should be in my irq_cleanup branch, test welcome
>> works with the below patch on top your irq_cleanup branch:
>>
>
> Thanks Mike, looks like a fix. You mind if I merge this into the previous patch
> with your Signed-off-by?
No problem.
>> -
>> From: Mike Rapoport <mike@compulab.co.il>
>> Date: Tue, 25 May 2010 11:28:08 +0300
>> Subject: [PATCH] [ARM] it8152: update interrupts numbering to work with
>> sparse irqs
>>
>> Signed-off-by: Mike Rapoport <mike@compulab.co.il>
>> ---
>> arch/arm/include/asm/hardware/it8152.h | 3 ++-
>> 1 files changed, 2 insertions(+), 1 deletions(-)
>>
>> diff --git a/arch/arm/include/asm/hardware/it8152.h
>> b/arch/arm/include/asm/hardware/it8152.h
>> index 6700c7f..b2f95c7 100644
>> --- a/arch/arm/include/asm/hardware/it8152.h
>> +++ b/arch/arm/include/asm/hardware/it8152.h
>> @@ -75,7 +75,8 @@ extern unsigned long it8152_base_address;
>> IT8152_PD_IRQ(1) USB (USBR)
>> IT8152_PD_IRQ(0) Audio controller (ACR)
>> */
>> -#define IT8152_IRQ(x) (IRQ_BOARD_END + (x))
>> +#define IT8152_IRQ(x) (IRQ_BOARD_START + (x))
>> +#define IT8152_LAST_IRQ (IRQ_BOARD_START + 40)
>>
>> /* IRQ-sources in 3 groups - local devices, LPC (serial), and external PCI
>> */
>> #define IT8152_LD_IRQ_COUNT 9
>> --
>> 1.6.4.4
>>
>>>> On May 24, 2010 3:34 PM, "Mike Rapoport" <mike@compulab.co.il
>>>> <mailto:mike@compulab.co.il>> wrote:
>>>>
>>>> Hi Eric,
>>>>
>>>>
>>>>
>>>> Eric Miao wrote:
>>>>> Cc: Mike Rapoport <mike at compulab.co.il <mailto:mike@compulab.co.il>>
>>>>> Signed-off-by: Eric Miao <eric.y.mi...
>>>> Looks Ok to me. Do you have a tree I can pull to test your changes?
>>>>
>>>>
>>>>
>>>>> diff --git a/arch/arm/mach-pxa/cm-x2xx-pci.h
>>>>> b/arch/arm/mach-pxa/cm-x2xx-pci.h
>>>>> index e24aad2.....
>>>> Sincerely yours,
>>>> Mike.
>>
>> --
>> Sincerely yours,
>> Mike.
>>
>>
>> From ec3ae629d9844ea5f6d7588ca7451377e640a960 Mon Sep 17 00:00:00 2001
>> From: Mike Rapoport <mike@compulab.co.il>
>> Date: Tue, 25 May 2010 11:28:08 +0300
>> Subject: [PATCH] [ARM] it8152: update interrupts numbering to work with
>> sparse irqs
>>
>> Signed-off-by: Mike Rapoport <mike@compulab.co.il>
>> ---
>> arch/arm/include/asm/hardware/it8152.h | 3 ++-
>> 1 files changed, 2 insertions(+), 1 deletions(-)
>>
>> diff --git a/arch/arm/include/asm/hardware/it8152.h
>> b/arch/arm/include/asm/hardware/it8152.h
>> index 6700c7f..b2f95c7 100644
>> --- a/arch/arm/include/asm/hardware/it8152.h
>> +++ b/arch/arm/include/asm/hardware/it8152.h
>> @@ -75,7 +75,8 @@ extern unsigned long it8152_base_address;
>> IT8152_PD_IRQ(1) USB (USBR)
>> IT8152_PD_IRQ(0) Audio controller (ACR)
>> */
>> -#define IT8152_IRQ(x) (IRQ_BOARD_END + (x))
>> +#define IT8152_IRQ(x) (IRQ_BOARD_START + (x))
>> +#define IT8152_LAST_IRQ (IRQ_BOARD_START + 40)
>>
>> /* IRQ-sources in 3 groups - local devices, LPC (serial), and external PCI
>> */
>> #define IT8152_LD_IRQ_COUNT 9
>> --
>> 1.6.4.4
>>
>>
>>
--
Sincerely yours,
Mike.
^ permalink raw reply [flat|nested] 12+ messages in thread