openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: mmp: remove NR_IRQS 

Remove NR_IRQS and add a per machine .nr_irqs setting. Clean-up namespace
replacing usage of IRQ_BOARD_START with MMP_NR_IRQS.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
This commit is contained in:
Rob Herring 2012-01-03 16:50:40 -06:00
parent 0f55239348
commit 8661fb9204
11 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-mmp/aspenite.c
View File

@ -24,6 +24,7 @@
#include <mach/addr-map.h> #include <mach/addr-map.h>
#include <mach/mfp-pxa168.h> #include <mach/mfp-pxa168.h>
#include <mach/pxa168.h> #include <mach/pxa168.h>
#include <mach/irqs.h>
#include <video/pxa168fb.h> #include <video/pxa168fb.h>
#include <linux/input.h> #include <linux/input.h>
#include <plat/pxa27x_keypad.h> #include <plat/pxa27x_keypad.h>
@ -240,7 +241,7 @@ static void __init common_init(void)
MACHINE_START(ASPENITE, "PXA168-based Aspenite Development Platform") MACHINE_START(ASPENITE, "PXA168-based Aspenite Development Platform")
.map_io = mmp_map_io, .map_io = mmp_map_io,
.nr_irqs = IRQ_BOARD_START, .nr_irqs = MMP_NR_IRQS,
.init_irq = pxa168_init_irq, .init_irq = pxa168_init_irq,
.timer = &pxa168_timer, .timer = &pxa168_timer,
.init_machine = common_init, .init_machine = common_init,
@ -249,7 +250,7 @@ MACHINE_END
MACHINE_START(ZYLONITE2, "PXA168-based Zylonite2 Development Platform") MACHINE_START(ZYLONITE2, "PXA168-based Zylonite2 Development Platform")
.map_io = mmp_map_io, .map_io = mmp_map_io,
.nr_irqs = IRQ_BOARD_START, .nr_irqs = MMP_NR_IRQS,
.init_irq = pxa168_init_irq, .init_irq = pxa168_init_irq,
.timer = &pxa168_timer, .timer = &pxa168_timer,
.init_machine = common_init, .init_machine = common_init,

1
arch/arm/mach-mmp/avengers_lite.c
View File

@ -43,6 +43,7 @@ static void __init avengers_lite_init(void)
MACHINE_START(AVENGERS_LITE, "PXA168 Avengers lite Development Platform") MACHINE_START(AVENGERS_LITE, "PXA168 Avengers lite Development Platform")
.map_io = mmp_map_io, .map_io = mmp_map_io,
.nr_irqs = MMP_NR_IRQS,
.init_irq = pxa168_init_irq, .init_irq = pxa168_init_irq,
.timer = &pxa168_timer, .timer = &pxa168_timer,
.init_machine = avengers_lite_init, .init_machine = avengers_lite_init,

4
arch/arm/mach-mmp/brownstone.c
View File

@ -28,7 +28,7 @@
#include "common.h" #include "common.h"
#define BROWNSTONE_NR_IRQS (IRQ_BOARD_START + 40) #define BROWNSTONE_NR_IRQS (MMP_NR_IRQS + 40)
#define GPIO_5V_ENABLE (89) #define GPIO_5V_ENABLE (89)
@ -158,7 +158,7 @@ static struct platform_device brownstone_v_5vp_device = {
}; };
static struct max8925_platform_data brownstone_max8925_info = { static struct max8925_platform_data brownstone_max8925_info = {
.irq_base = IRQ_BOARD_START, .irq_base = MMP_NR_IRQS,
}; };
static struct i2c_board_info brownstone_twsi1_info[] = { static struct i2c_board_info brownstone_twsi1_info[] = {

3
arch/arm/mach-mmp/flint.c
View File

@ -23,10 +23,11 @@
#include <mach/addr-map.h> #include <mach/addr-map.h>
#include <mach/mfp-mmp2.h> #include <mach/mfp-mmp2.h>
#include <mach/mmp2.h> #include <mach/mmp2.h>
#include <mach/irqs.h>
#include "common.h" #include "common.h"
#define FLINT_NR_IRQS (IRQ_BOARD_START + 48) #define FLINT_NR_IRQS (MMP_NR_IRQS + 48)
static unsigned long flint_pin_config[] __initdata = { static unsigned long flint_pin_config[] __initdata = {
/* UART1 */ /* UART1 */

2
arch/arm/mach-mmp/gplugd.c
View File

@ -191,7 +191,7 @@ static void __init gplugd_init(void)
MACHINE_START(GPLUGD, "PXA168-based GuruPlug Display (gplugD) Platform") MACHINE_START(GPLUGD, "PXA168-based GuruPlug Display (gplugD) Platform")
.map_io = mmp_map_io, .map_io = mmp_map_io,
.nr_irqs = IRQ_BOARD_START, .nr_irqs = MMP_NR_IRQS,
.init_irq = pxa168_init_irq, .init_irq = pxa168_init_irq,
.timer = &pxa168_timer, .timer = &pxa168_timer,
.init_machine = gplugd_init, .init_machine = gplugd_init,

3
arch/arm/mach-mmp/include/mach/irqs.h
View File

@ -223,7 +223,6 @@
#define MMP_GPIO_TO_IRQ(gpio) (IRQ_GPIO_START + (gpio)) #define MMP_GPIO_TO_IRQ(gpio) (IRQ_GPIO_START + (gpio))
#define IRQ_BOARD_START (IRQ_GPIO_START + MMP_NR_BUILTIN_GPIO) #define IRQ_BOARD_START (IRQ_GPIO_START + MMP_NR_BUILTIN_GPIO)
#define MMP_NR_IRQS IRQ_BOARD_START
#define NR_IRQS (IRQ_BOARD_START)
#endif /* __ASM_MACH_IRQS_H */ #endif /* __ASM_MACH_IRQS_H */

1
arch/arm/mach-mmp/irq-mmp2.c
View File

@ -15,6 +15,7 @@
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/irqs.h>
#include <mach/regs-icu.h> #include <mach/regs-icu.h>
#include <mach/mmp2.h> #include <mach/mmp2.h>

5
arch/arm/mach-mmp/jasper.c
View File

@ -19,6 +19,7 @@
#include <linux/mfd/max8925.h> #include <linux/mfd/max8925.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <mach/irqs.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/addr-map.h> #include <mach/addr-map.h>
@ -27,7 +28,7 @@
#include "common.h" #include "common.h"
#define JASPER_NR_IRQS (IRQ_BOARD_START + 48) #define JASPER_NR_IRQS (MMP_NR_IRQS + 48)
static unsigned long jasper_pin_config[] __initdata = { static unsigned long jasper_pin_config[] __initdata = {
/* UART1 */ /* UART1 */
@ -135,7 +136,7 @@ static struct max8925_power_pdata jasper_power_data = {
static struct max8925_platform_data jasper_max8925_info = { static struct max8925_platform_data jasper_max8925_info = {
.backlight = &jasper_backlight_data, .backlight = &jasper_backlight_data,
.power = &jasper_power_data, .power = &jasper_power_data,
.irq_base = IRQ_BOARD_START, .irq_base = MMP_NR_IRQS,
}; };
static struct i2c_board_info jasper_twsi1_info[] = { static struct i2c_board_info jasper_twsi1_info[] = {

1
arch/arm/mach-mmp/tavorevb.c
View File

@ -102,6 +102,7 @@ static void __init tavorevb_init(void)
MACHINE_START(TAVOREVB, "PXA910 Evaluation Board (aka TavorEVB)") MACHINE_START(TAVOREVB, "PXA910 Evaluation Board (aka TavorEVB)")
.map_io = mmp_map_io, .map_io = mmp_map_io,
.nr_irqs = MMP_NR_IRQS,
.init_irq = pxa910_init_irq, .init_irq = pxa910_init_irq,
.timer = &pxa910_timer, .timer = &pxa910_timer,
.init_machine = tavorevb_init, .init_machine = tavorevb_init,

3
arch/arm/mach-mmp/teton_bga.c
View File

@ -26,6 +26,7 @@
#include <mach/mfp-pxa168.h> #include <mach/mfp-pxa168.h>
#include <mach/pxa168.h> #include <mach/pxa168.h>
#include <mach/teton_bga.h> #include <mach/teton_bga.h>
#include <mach/irqs.h>
#include "common.h" #include "common.h"
@ -83,7 +84,7 @@ static void __init teton_bga_init(void)
MACHINE_START(TETON_BGA, "PXA168-based Teton BGA Development Platform") MACHINE_START(TETON_BGA, "PXA168-based Teton BGA Development Platform")
.map_io = mmp_map_io, .map_io = mmp_map_io,
.nr_irqs = IRQ_BOARD_START, .nr_irqs = MMP_NR_IRQS,
.init_irq = pxa168_init_irq, .init_irq = pxa168_init_irq,
.timer = &pxa168_timer, .timer = &pxa168_timer,
.init_machine = teton_bga_init, .init_machine = teton_bga_init,

4
arch/arm/mach-mmp/ttc_dkb.c
View File

@ -38,7 +38,7 @@
* 16 board interrupts -- PCA9575 GPIO expander * 16 board interrupts -- PCA9575 GPIO expander
* 24 board interrupts -- 88PM860x PMIC * 24 board interrupts -- 88PM860x PMIC
*/ */
#define TTCDKB_NR_IRQS (IRQ_BOARD_START + 16 + 16 + 24) #define TTCDKB_NR_IRQS (MMP_NR_IRQS + 16 + 16 + 24)
static unsigned long ttc_dkb_pin_config[] __initdata = { static unsigned long ttc_dkb_pin_config[] __initdata = {
/* UART2 */ /* UART2 */
@ -130,7 +130,7 @@ static struct platform_device *ttc_dkb_devices[] = {
static struct pca953x_platform_data max7312_data[] = { static struct pca953x_platform_data max7312_data[] = {
{ {
.gpio_base = TTCDKB_GPIO_EXT0(0), .gpio_base = TTCDKB_GPIO_EXT0(0),
.irq_base = IRQ_BOARD_START, .irq_base = MMP_NR_IRQS,
}, },
}; };