Skip to contentSkip to conversation

ARM: mmp: move irq driver into irqchip

PATCH Superseded Haojian Zhuang 2 participants 8 messages May 28, 2013

Subsystems (6)

v2 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

v2 cover ARM: mmp: move irq driver into irqchip

Changelog:
v2:
1. Avoid to include <mach/irqs.h>. Move the head file into include/linux/irqchip directory.
2. Avoid to include <mach/pm-pxa910.h> & <mach/pm-mmp2.h>.

#1 lore raw

PATCH v2 1/5 irqchip: move mmp irq driver

Move irq-mmp driver from mach-mmp directory into irqchip directory.

---
 arch/arm/mach-mmp/Makefile                           | 2 +-
 arch/arm/mach-mmp/common.h                           | 1 -
 arch/arm/mach-mmp/include/mach/pxa168.h              | 1 +
 arch/arm/mach-mmp/include/mach/pxa910.h              | 1 +
 arch/arm/mach-mmp/pxa910.c                           | 1 +
 drivers/irqchip/Makefile                             | 1 +
 arch/arm/mach-mmp/irq.c => drivers/irqchip/irq-mmp.c | 2 --
 7 files changed, 5 insertions(+), 4 deletions(-)
 rename arch/arm/mach-mmp/irq.c => drivers/irqchip/irq-mmp.c (99%)
arch/arm/mach-mmp/Makefile +1 -1
index 095c155..9b702a1 100644
@@ -2,7 +2,7 @@
 # Makefile for Marvell's PXA168 processors line
 #
 
-obj-y				+= common.o devices.o time.o irq.o
+obj-y				+= common.o devices.o time.o
 
 # SoC support
 obj-$(CONFIG_CPU_PXA168)	+= pxa168.o
arch/arm/mach-mmp/common.h +0 -1
index 0bdc50b..9c1c9be 100644
@@ -2,7 +2,6 @@
 
 extern void timer_init(int irq);
 
-extern void __init icu_init_irq(void);
 extern void __init mmp_map_io(void);
 extern void mmp_restart(char, const char *);
 extern void __init pxa168_clk_init(void);
arch/arm/mach-mmp/include/mach/pxa168.h +1 -0
index 7ed1df2..e01dc2a 100644
@@ -2,6 +2,7 @@
 #define __ASM_MACH_PXA168_H
 
 extern void pxa168_timer_init(void);
+extern void __init icu_init_irq(void);
 extern void __init pxa168_init_irq(void);
 extern void pxa168_restart(char, const char *);
 extern void pxa168_clear_keypad_wakeup(void);
arch/arm/mach-mmp/include/mach/pxa910.h +1 -0
index b914afa..9225320 100644
@@ -2,6 +2,7 @@
 #define __ASM_MACH_PXA910_H
 
 extern void pxa910_timer_init(void);
+extern void __init icu_init_irq(void);
 extern void __init pxa910_init_irq(void);
 
 #include <linux/i2c.h>
arch/arm/mach-mmp/pxa910.c +1 -0
index ce6393a..a586742 100644
@@ -23,6 +23,7 @@
 #include <mach/dma.h>
 #include <mach/mfp.h>
 #include <mach/devices.h>
+#include <mach/pxa910.h>
 
 #include "common.h"
 
drivers/irqchip/Makefile +1 -0
index cda4cb5..542d47e 100644
@@ -7,6 +7,7 @@ obj-$(CONFIG_ARCH_MXS)			+= irq-mxs.o
 obj-$(CONFIG_ARCH_S3C24XX)		+= irq-s3c24xx.o
 obj-$(CONFIG_METAG)			+= irq-metag-ext.o
 obj-$(CONFIG_METAG_PERFCOUNTER_IRQS)	+= irq-metag.o
+obj-$(CONFIG_ARCH_MMP)			+= irq-mmp.o
 obj-$(CONFIG_ARCH_SUNXI)		+= irq-sun4i.o
 obj-$(CONFIG_ARCH_SPEAR3XX)		+= spear-shirq.o
 obj-$(CONFIG_ARM_GIC)			+= irq-gic.o
drivers/irqchip/irq-mmp.c renamed from arch/arm/mach-mmp/irq.c +0 -2
similarity index 99%
rename from arch/arm/mach-mmp/irq.c
rename to drivers/irqchip/irq-mmp.c
index 3c71246..dab6def 100644
@@ -30,8 +30,6 @@
 #include <mach/pm-pxa910.h>
 #endif
 
-#include "common.h"
-
 #define MAX_ICU_NR		16
 
 struct icu_chip_data {
Signature · 1 line
1.8.1.2
#2 lore raw

PATCH v2 2/5 irqchip: mmp: support irqchip

In reply to Haojian Zhuang

Support IRQCHIP on irq-mmp driver.

---
 arch/arm/mach-mmp/mmp-dt.c  |  10 +--
 arch/arm/mach-mmp/mmp2-dt.c |   9 +-
 drivers/irqchip/irq-mmp.c   | 208 ++++++++++++++++++++++----------------------
 3 files changed, 109 insertions(+), 118 deletions(-)
arch/arm/mach-mmp/mmp-dt.c +3 -7
index b37915d..aaca3c8 100644
@@ -9,17 +9,13 @@
  *  publishhed by the Free Software Foundation.
  */
 
-#include <linux/irq.h>
-#include <linux/irqdomain.h>
-#include <linux/of_irq.h>
+#include <linux/irqchip.h>
 #include <linux/of_platform.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
-#include <mach/irqs.h>
 
 #include "common.h"
 
-extern void __init mmp_dt_irq_init(void);
 extern void __init mmp_dt_init_timer(void);
 
 static const struct of_dev_auxdata pxa168_auxdata_lookup[] __initconst = {
@@ -64,7 +60,7 @@ static const char *mmp_dt_board_compat[] __initdata = {
 
 DT_MACHINE_START(PXA168_DT, "Marvell PXA168 (Device Tree Support)")
 	.map_io		= mmp_map_io,
-	.init_irq	= mmp_dt_irq_init,
+	.init_irq	= irqchip_init,
 	.init_time	= mmp_dt_init_timer,
 	.init_machine	= pxa168_dt_init,
 	.dt_compat	= mmp_dt_board_compat,
@@ -72,7 +68,7 @@ MACHINE_END
 
 DT_MACHINE_START(PXA910_DT, "Marvell PXA910 (Device Tree Support)")
 	.map_io		= mmp_map_io,
-	.init_irq	= mmp_dt_irq_init,
+	.init_irq	= irqchip_init,
 	.init_time	= mmp_dt_init_timer,
 	.init_machine	= pxa910_dt_init,
 	.dt_compat	= mmp_dt_board_compat,
arch/arm/mach-mmp/mmp2-dt.c +2 -7
index 4ac2567..d12231d 100644
@@ -10,18 +10,13 @@
  */
 
 #include <linux/io.h>
-#include <linux/irq.h>
-#include <linux/irqdomain.h>
-#include <linux/of_irq.h>
+#include <linux/irqchip.h>
 #include <linux/of_platform.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
-#include <mach/irqs.h>
-#include <mach/regs-apbc.h>
 
 #include "common.h"
 
-extern void __init mmp_dt_irq_init(void);
 extern void __init mmp_dt_init_timer(void);
 
 static const struct of_dev_auxdata mmp2_auxdata_lookup[] __initconst = {
@@ -49,7 +44,7 @@ static const char *mmp2_dt_board_compat[] __initdata = {
 
 DT_MACHINE_START(MMP2_DT, "Marvell MMP2 (Device Tree Support)")
 	.map_io		= mmp_map_io,
-	.init_irq	= mmp_dt_irq_init,
+	.init_irq	= irqchip_init,
 	.init_time	= mmp_dt_init_timer,
 	.init_machine	= mmp2_dt_init,
 	.dt_compat	= mmp2_dt_board_compat,
drivers/irqchip/irq-mmp.c +104 -104

248 lines not on this page · raw message

Signature · 1 line
1.8.1.2
#3 lore raw

PATCH v2 2/5 irqchip: mmp: support irqchip

Quoted 3 lines · Haojian Zhuang
        icu_data[0].domain = irq_domain_add_legacy(node, nr_irqs, 0, 0,
                                                   &mmp_irq_domain_ops,
                                                   &icu_data[0]);

Is there anything stopping you from converting to the linear domain now?

drivers/irqchip/irq-mmp.c void __init mmp2_init_icu(void) · line 460

Quoted 3 lines
drivers/irqchip/irq-mmp.c +3 -0
+IRQCHIP_DECLARE(mmp_intc, "mrvl,mmp-intc", mmp_of_init);
+IRQCHIP_DECLARE(mmp2_intc, "mrvl,mmp2-intc", mmp2_of_init);
+IRQCHIP_DECLARE(mmp2_mux_intc, "mrvl,mmp2-mux-intc", mmp2_mux_of_init);

Please put each line directly after the function it refers to, similar to how we do it for EXPORT_SYMBOL.

Arnd

#4 lore raw

PATCH v2 3/5 irqchip: mmp: support MULTI_IRQ_HANDLER

In reply to Haojian Zhuang

Support CONFIG_MULTI_IRQ_HANDLER in ARCH_MMP. So remove entry-macro.S.

---
 arch/arm/Kconfig                             |  1 +
 arch/arm/mach-mmp/include/mach/entry-macro.S | 26 -----------------
 drivers/irqchip/irq-mmp.c                    | 42 +++++++++++++++++++++++++++-
 3 files changed, 42 insertions(+), 27 deletions(-)
 delete mode 100644 arch/arm/mach-mmp/include/mach/entry-macro.S
arch/arm/Kconfig +1 -0
index 49d993c..b8ba50b 100644
@@ -550,6 +550,7 @@ config ARCH_MMP
 	select GENERIC_CLOCKEVENTS
 	select GPIO_PXA
 	select IRQ_DOMAIN
+	select MULTI_IRQ_HANDLER
 	select NEED_MACH_GPIO_H
 	select PINCTRL
 	select PLAT_PXA
arch/arm/mach-mmp/include/mach/entry-macro.S deleted +0 -26
deleted file mode 100644
index bd152e2..0000000
@@ -1,26 +0,0 @@
-/*
- * linux/arch/arm/mach-mmp/include/mach/entry-macro.S
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <asm/irq.h>
-#include <mach/regs-icu.h>
-
-	.macro	get_irqnr_preamble, base, tmp
-	mrc	p15, 0, \tmp, c0, c0, 0		@ CPUID
-	and	\tmp, \tmp, #0xff00
-	cmp	\tmp, #0x5800
-	ldr	\base, =mmp_icu_base
-	ldr	\base, [\base, #0]
-	addne	\base, \base, #0x10c		@ PJ1 AP INT SEL register
-	addeq	\base, \base, #0x104		@ PJ4 IRQ SEL register
-	.endm
-
-	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp
-	ldr	\tmp, [\base, #0]
-	and	\irqnr, \tmp, #0x3f
-	tst	\tmp, #(1 << 6)
-	.endm
drivers/irqchip/irq-mmp.c +41 -1

90 lines not on this page · raw message

Signature · 1 line
1.8.1.2
#5 lore raw

PATCH v2 4/5 ARM: mmp: move irqs head file

In reply to Haojian Zhuang

Since irq-mmp driver includes <mach/irqs.h>, it blocks the multiple platform build. So move the head file into include/linux/irqchip/ directory.

---
 arch/arm/mach-mmp/aspenite.c                                         | 2 +-
 arch/arm/mach-mmp/avengers_lite.c                                    | 2 +-
 arch/arm/mach-mmp/brownstone.c                                       | 2 +-
 arch/arm/mach-mmp/devices.c                                          | 2 +-
 arch/arm/mach-mmp/flint.c                                            | 2 +-
 arch/arm/mach-mmp/gplugd.c                                           | 2 +-
 arch/arm/mach-mmp/jasper.c                                           | 2 +-
 arch/arm/mach-mmp/mmp2.c                                             | 2 +-
 arch/arm/mach-mmp/pm-mmp2.c                                          | 2 +-
 arch/arm/mach-mmp/pm-pxa910.c                                        | 2 +-
 arch/arm/mach-mmp/pxa168.c                                           | 2 +-
 arch/arm/mach-mmp/pxa910.c                                           | 2 +-
 arch/arm/mach-mmp/tavorevb.c                                         | 2 +-
 arch/arm/mach-mmp/teton_bga.c                                        | 2 +-
 arch/arm/mach-mmp/time.c                                             | 2 +-
 arch/arm/mach-mmp/ttc_dkb.c                                          | 2 +-
 drivers/gpio/gpio-pxa.c                                              | 3 +--
 drivers/irqchip/irq-mmp.c                                            | 3 +--
 arch/arm/mach-mmp/include/mach/irqs.h => include/linux/irqchip/mmp.h | 0
 19 files changed, 18 insertions(+), 20 deletions(-)
 rename arch/arm/mach-mmp/include/mach/irqs.h => include/linux/irqchip/mmp.h (100%)
arch/arm/mach-mmp/aspenite.c +1 -1
index 5b660ec..e850fc0 100644
@@ -11,6 +11,7 @@
 #include <linux/gpio.h>
 #include <linux/gpio-pxa.h>
 #include <linux/init.h>
+#include <linux/irqchip/mmp.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/smc91x.h>
@@ -25,7 +26,6 @@
 #include <mach/addr-map.h>
 #include <mach/mfp-pxa168.h>
 #include <mach/pxa168.h>
-#include <mach/irqs.h>
 #include <video/pxa168fb.h>
 #include <linux/input.h>
 #include <linux/platform_data/keypad-pxa27x.h>
arch/arm/mach-mmp/avengers_lite.c +1 -1
index a451a0f..c2c5b09 100644
@@ -11,6 +11,7 @@
  */
 
 #include <linux/init.h>
+#include <linux/irqchip/mmp.h>
 #include <linux/kernel.h>
 #include <linux/gpio-pxa.h>
 #include <linux/platform_device.h>
@@ -20,7 +21,6 @@
 #include <mach/addr-map.h>
 #include <mach/mfp-pxa168.h>
 #include <mach/pxa168.h>
-#include <mach/irqs.h>
 
 
 #include "common.h"
arch/arm/mach-mmp/brownstone.c +1 -1
index ac25544..41941b6 100644
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
+#include <linux/irqchip/mmp.h>
 #include <linux/gpio-pxa.h>
 #include <linux/regulator/machine.h>
 #include <linux/regulator/max8649.h>
@@ -25,7 +26,6 @@
 #include <mach/addr-map.h>
 #include <mach/mfp-mmp2.h>
 #include <mach/mmp2.h>
-#include <mach/irqs.h>
 
 #include "common.h"
 
arch/arm/mach-mmp/devices.c +1 -1
index dd2d8b1..bbb0aa0 100644
@@ -7,12 +7,12 @@
  */
 
 #include <linux/init.h>
+#include <linux/irqchip/mmp.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/delay.h>
 
 #include <asm/irq.h>
-#include <mach/irqs.h>
 #include <mach/devices.h>
 #include <mach/cputype.h>
 #include <mach/regs-usb.h>
arch/arm/mach-mmp/flint.c +1 -1
index 6291c33..0c733f5 100644
@@ -15,6 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/smc91x.h>
 #include <linux/io.h>
+#include <linux/irqchip/mmp.h>
 #include <linux/gpio.h>
 #include <linux/gpio-pxa.h>
 #include <linux/interrupt.h>
@@ -24,7 +25,6 @@
 #include <mach/addr-map.h>
 #include <mach/mfp-mmp2.h>
 #include <mach/mmp2.h>
-#include <mach/irqs.h>
 
 #include "common.h"
 
arch/arm/mach-mmp/gplugd.c +1 -1
index d81b247..87b884f 100644
@@ -9,6 +9,7 @@
  */
 
 #include <linux/init.h>
+#include <linux/irqchip/mmp.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
 #include <linux/gpio-pxa.h>
@@ -16,7 +17,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach-types.h>
 
-#include <mach/irqs.h>
 #include <mach/pxa168.h>
 #include <mach/mfp-pxa168.h>
 
arch/arm/mach-mmp/jasper.c +1 -1
index 0e9e5c0..68dc03b 100644
@@ -15,12 +15,12 @@
 #include <linux/gpio-pxa.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
+#include <linux/irqchip/mmp.h>
 #include <linux/regulator/machine.h>
 #include <linux/regulator/max8649.h>
 #include <linux/mfd/max8925.h>
 #include <linux/interrupt.h>
 
-#include <mach/irqs.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/addr-map.h>
arch/arm/mach-mmp/mmp2.c +1 -1
index c7592f1..08245c7 100644
@@ -13,6 +13,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/io.h>
+#include <linux/irqchip/mmp.h>
 #include <linux/platform_device.h>
 
 #include <asm/hardware/cache-tauros2.h>
@@ -21,7 +22,6 @@
 #include <mach/addr-map.h>
 #include <mach/regs-apbc.h>
 #include <mach/cputype.h>
-#include <mach/irqs.h>
 #include <mach/dma.h>
 #include <mach/mfp.h>
 #include <mach/devices.h>
arch/arm/mach-mmp/pm-mmp2.c +1 -1
index 461a191..7646829 100644
@@ -15,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/suspend.h>
 #include <linux/irq.h>
+#include <linux/irqchip/mmp.h>
 #include <linux/io.h>
 #include <linux/interrupt.h>
 #include <asm/mach-types.h>
@@ -23,7 +24,6 @@
 #include <mach/addr-map.h>
 #include <mach/pm-mmp2.h>
 #include <mach/regs-icu.h>
-#include <mach/irqs.h>
 
 int mmp2_set_wake(struct irq_data *d, unsigned int on)
 {
arch/arm/mach-mmp/pm-pxa910.c +1 -1
index 48981ca..e919539 100644
@@ -17,13 +17,13 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/irq.h>
+#include <linux/irqchip/mmp.h>
 #include <asm/mach-types.h>
 #include <mach/hardware.h>
 #include <mach/cputype.h>
 #include <mach/addr-map.h>
 #include <mach/pm-pxa910.h>
 #include <mach/regs-icu.h>
-#include <mach/irqs.h>
 
 int pxa910_set_wake(struct irq_data *data, unsigned int on)
 {
arch/arm/mach-mmp/pxa168.c +1 -1
index a30dcf3..8da96de 100644
@@ -10,6 +10,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/irqchip/mmp.h>
 #include <linux/list.h>
 #include <linux/io.h>
 #include <linux/clk.h>
@@ -22,7 +23,6 @@
 #include <mach/addr-map.h>
 #include <mach/regs-apbc.h>
 #include <mach/regs-apmu.h>
-#include <mach/irqs.h>
 #include <mach/dma.h>
 #include <mach/devices.h>
 #include <mach/mfp.h>
arch/arm/mach-mmp/pxa910.c +1 -1
index a586742..4ce3e16 100644
@@ -12,6 +12,7 @@
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/io.h>
+#include <linux/irqchip/mmp.h>
 #include <linux/platform_device.h>
 
 #include <asm/hardware/cache-tauros2.h>
@@ -19,7 +20,6 @@
 #include <mach/addr-map.h>
 #include <mach/regs-apbc.h>
 #include <mach/cputype.h>
-#include <mach/irqs.h>
 #include <mach/dma.h>
 #include <mach/mfp.h>
 #include <mach/devices.h>
arch/arm/mach-mmp/tavorevb.c +1 -1
index cdfc9bf..d3bb3a7 100644
@@ -10,6 +10,7 @@
 #include <linux/gpio.h>
 #include <linux/gpio-pxa.h>
 #include <linux/init.h>
+#include <linux/irqchip/mmp.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/smc91x.h>
@@ -19,7 +20,6 @@
 #include <mach/addr-map.h>
 #include <mach/mfp-pxa910.h>
 #include <mach/pxa910.h>
-#include <mach/irqs.h>
 
 #include "common.h"
 
arch/arm/mach-mmp/teton_bga.c +1 -1
index e4d95b4..a88a2ff 100644
@@ -18,6 +18,7 @@
 #include <linux/gpio.h>
 #include <linux/gpio-pxa.h>
 #include <linux/input.h>
+#include <linux/irqchip/mmp.h>
 #include <linux/platform_data/keypad-pxa27x.h>
 #include <linux/i2c.h>
 
@@ -27,7 +28,6 @@
 #include <mach/mfp-pxa168.h>
 #include <mach/pxa168.h>
 #include <mach/teton_bga.h>
-#include <mach/irqs.h>
 
 #include "common.h"
 
arch/arm/mach-mmp/time.c +1 -1
index 86a18b3..891b9da 100644
@@ -25,6 +25,7 @@
 
 #include <linux/io.h>
 #include <linux/irq.h>
+#include <linux/irqchip/mmp.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
@@ -33,7 +34,6 @@
 #include <mach/addr-map.h>
 #include <mach/regs-timers.h>
 #include <mach/regs-apbc.h>
-#include <mach/irqs.h>
 #include <mach/cputype.h>
 #include <asm/mach/time.h>
 
arch/arm/mach-mmp/ttc_dkb.c +1 -1
index 8483906..39db088 100644
@@ -15,6 +15,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/onenand.h>
 #include <linux/interrupt.h>
+#include <linux/irqchip/mmp.h>
 #include <linux/i2c/pca953x.h>
 #include <linux/gpio.h>
 #include <linux/gpio-pxa.h>
@@ -29,7 +30,6 @@
 #include <mach/addr-map.h>
 #include <mach/mfp-pxa910.h>
 #include <mach/pxa910.h>
-#include <mach/irqs.h>
 #include <mach/regs-usb.h>
 
 #include "common.h"
drivers/gpio/gpio-pxa.c +1 -2
index df2199d..cb8f31f 100644
@@ -20,6 +20,7 @@
 #include <linux/irq.h>
 #include <linux/irqdomain.h>
 #include <linux/irqchip/chained_irq.h>
+#include <linux/irqchip/mmp.h>
 #include <linux/io.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
@@ -27,8 +28,6 @@
 #include <linux/syscore_ops.h>
 #include <linux/slab.h>
 
-#include <mach/irqs.h>
-
 /*
  * We handle the GPIOs by banks, each bank covers up to 32 GPIOs with
  * one set of registers. The register offsets are organized below:
drivers/irqchip/irq-mmp.c +1 -2
index f54ebca..90fe265 100644
@@ -15,6 +15,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/irq.h>
+#include <linux/irqchip/mmp.h>
 #include <linux/irqdomain.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
@@ -24,8 +25,6 @@
 #include <asm/exception.h>
 #include <asm/mach/irq.h>
 
-#include <mach/irqs.h>
-
 #ifdef CONFIG_CPU_MMP2
 #include <mach/pm-mmp2.h>
 #endif
include/linux/irqchip/mmp.h renamed from arch/arm/mach-mmp/include/mach/irqs.h +0 -0
similarity index 100%
rename from arch/arm/mach-mmp/include/mach/irqs.h
rename to include/linux/irqchip/mmp.h
Signature · 1 line
1.8.1.2
#6 lore raw

PATCH v2 4/5 ARM: mmp: move irqs head file

Quoted 5 lines · Haojian Zhuang

Since irq-mmp driver includes <mach/irqs.h>, it blocks the multiple platform build. So move the head file into include/linux/irqchip/ directory.

I disagree with simply moving the file. Let's check first what is actually needed from it.

Quoted 13 lines
 arch/arm/mach-mmp/aspenite.c                                         | 2 +-
 arch/arm/mach-mmp/avengers_lite.c                                    | 2 +-
 arch/arm/mach-mmp/brownstone.c                                       | 2 +-
 arch/arm/mach-mmp/devices.c                                          | 2 +-
 arch/arm/mach-mmp/flint.c                                            | 2 +-
 arch/arm/mach-mmp/gplugd.c                                           | 2 +-
 arch/arm/mach-mmp/jasper.c                                           | 2 +-
 arch/arm/mach-mmp/mmp2.c                                             | 2 +-
 arch/arm/mach-mmp/pm-mmp2.c                                          | 2 +-
 arch/arm/mach-mmp/pm-pxa910.c                                        | 2 +-
 arch/arm/mach-mmp/pxa168.c                                           | 2 +-
 arch/arm/mach-mmp/pxa910.c                                           | 2 +-
 arch/arm/mach-mmp/tavorevb.c                                         | 2 +-
Quoted 8 lines
 arch/arm/mach-mmp/teton_bga.c                                        | 2 +-
 arch/arm/mach-mmp/time.c                                             | 2 +-
 arch/arm/mach-mmp/ttc_dkb.c                                          | 2 +-
 drivers/gpio/gpio-pxa.c                                              | 3 +--
 drivers/irqchip/irq-mmp.c                                            | 3 +--
 arch/arm/mach-mmp/include/mach/irqs.h => include/linux/irqchip/mmp.h | 0
 19 files changed, 18 insertions(+), 20 deletions(-)
 rename arch/arm/mach-mmp/include/mach/irqs.h => include/linux/irqchip/mmp.h (100%)

My guess is that the long list of IRQ numbers is only needed for legacy board files. That list would better be put into arch/arm/mach-mmp/irqs.h.

Try to move as much as you can from the include/linux/irqchip/mmp.h file into that new header. Some constants (e.g irq base numbers and mmio addresses) can be passed into the icu_init_irq/mmp2_init_icu functions as arguments so you don't need them in the global header.

Arnd

#7 lore raw

PATCH v2 5/5 ARM: mmp: avoid to include head file in mach-mmp

In reply to Haojian Zhuang

pxa910_set_wake() & mmp2_set_wake() are both declared in head files of arch/arm/mach-mmp/include/mach directory. If we include these head files in irq-mmp driver, it blocks the multiplatform build.

So adjust the code.

---
 arch/arm/mach-mmp/mmp2.c    |  3 +++
 arch/arm/mach-mmp/pxa910.c  |  3 +++
 drivers/irqchip/irq-mmp.c   | 15 +--------------
 include/linux/irqchip/mmp.h |  2 ++
 4 files changed, 9 insertions(+), 14 deletions(-)
arch/arm/mach-mmp/mmp2.c +3 -0
index 08245c7..2e5ce13 100644
@@ -13,6 +13,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/io.h>
+#include <linux/irq.h>
 #include <linux/irqchip/mmp.h>
 #include <linux/platform_device.h>
 
@@ -26,6 +27,7 @@
 #include <mach/mfp.h>
 #include <mach/devices.h>
 #include <mach/mmp2.h>
+#include <mach/pm-mmp2.h>
 
 #include "common.h"
 
@@ -94,6 +96,7 @@ void mmp2_clear_pmic_int(void)
 void __init mmp2_init_irq(void)
 {
 	mmp2_init_icu();
+	icu_irq_chip.irq_set_wake = mmp2_set_wake;
 }
 
 static int __init mmp2_init(void)
arch/arm/mach-mmp/pxa910.c +3 -0
index 4ce3e16..78b6e22 100644
@@ -12,6 +12,7 @@
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/io.h>
+#include <linux/irq.h>
 #include <linux/irqchip/mmp.h>
 #include <linux/platform_device.h>
 
@@ -23,6 +24,7 @@
 #include <mach/dma.h>
 #include <mach/mfp.h>
 #include <mach/devices.h>
+#include <mach/pm-pxa910.h>
 #include <mach/pxa910.h>
 
 #include "common.h"
@@ -80,6 +82,7 @@ static struct mfp_addr_map pxa910_mfp_addr_map[] __initdata =
 void __init pxa910_init_irq(void)
 {
 	icu_init_irq();
+	icu_irq_chip.irq_set_wake = pxa910_set_wake;
 }
 
 static int __init pxa910_init(void)
drivers/irqchip/irq-mmp.c +1 -14
index 90fe265..b2ec91a 100644
@@ -25,13 +25,6 @@
 #include <asm/exception.h>
 #include <asm/mach/irq.h>
 
-#ifdef CONFIG_CPU_MMP2
-#include <mach/pm-mmp2.h>
-#endif
-#ifdef CONFIG_CPU_PXA910
-#include <mach/pm-pxa910.h>
-#endif
-
 #include "irqchip.h"
 
 #define MAX_ICU_NR		16
@@ -131,7 +124,7 @@ static void icu_unmask_irq(struct irq_data *d)
 	}
 }
 
-static struct irq_chip icu_irq_chip = {
+struct irq_chip icu_irq_chip = {
 	.name		= "icu_irq",
 	.irq_mask	= icu_mask_irq,
 	.irq_mask_ack	= icu_mask_ack_irq,
@@ -250,9 +243,6 @@ void __init icu_init_irq(void)
 	}
 	irq_set_default_host(icu_data[0].domain);
 	set_handle_irq(mmp_handle_irq);
-#ifdef CONFIG_CPU_PXA910
-	icu_irq_chip.irq_set_wake = pxa910_set_wake;
-#endif
 }
 
 /* MMP2 (ARMv7) */
@@ -357,9 +347,6 @@ void __init mmp2_init_icu(void)
 	}
 	irq_set_default_host(icu_data[0].domain);
 	set_handle_irq(mmp2_handle_irq);
-#ifdef CONFIG_CPU_MMP2
-	icu_irq_chip.irq_set_wake = mmp2_set_wake;
-#endif
 }
 
 #ifdef CONFIG_OF
include/linux/irqchip/mmp.h +2 -0
index fb492a5..98558b7 100644
@@ -236,4 +236,6 @@
 #define IRQ_BOARD_START			(IRQ_GPIO_START + MMP_NR_BUILTIN_GPIO)
 #define MMP_NR_IRQS			IRQ_BOARD_START
 
+extern struct irq_chip icu_irq_chip;
+
 #endif /* __ASM_MACH_IRQS_H */
Signature · 1 line
1.8.1.2