Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8661fb92 authored by Rob Herring's avatar Rob Herring
Browse files

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: default avatarRob Herring <rob.herring@calxeda.com>
parent 0f552393

arch/arm/mach-mmp/aspenite.c

+3 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#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 <plat/pxa27x_keypad.h>
@@ -240,7 +241,7 @@ static void __init common_init(void) 


MACHINE_START(ASPENITE, "PXA168-based Aspenite Development Platform")

	.map_io		= mmp_map_io,

	.nr_irqs	= IRQ_BOARD_START,

	.nr_irqs	= MMP_NR_IRQS,

	.init_irq       = pxa168_init_irq,

	.timer          = &pxa168_timer,

	.init_machine   = common_init,
@@ -249,7 +250,7 @@ MACHINE_END 


MACHINE_START(ZYLONITE2, "PXA168-based Zylonite2 Development Platform")

	.map_io		= mmp_map_io,

	.nr_irqs	= IRQ_BOARD_START,

	.nr_irqs	= MMP_NR_IRQS,

	.init_irq       = pxa168_init_irq,

	.timer          = &pxa168_timer,

	.init_machine   = common_init,

arch/arm/mach-mmp/avengers_lite.c

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ static void __init avengers_lite_init(void) 


MACHINE_START(AVENGERS_LITE, "PXA168 Avengers lite Development Platform")

	.map_io		= mmp_map_io,

	.nr_irqs	= MMP_NR_IRQS,

	.init_irq       = pxa168_init_irq,

	.timer          = &pxa168_timer,

	.init_machine   = avengers_lite_init,

arch/arm/mach-mmp/brownstone.c

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 


#include "common.h"



#define BROWNSTONE_NR_IRQS	(IRQ_BOARD_START + 40)

#define BROWNSTONE_NR_IRQS	(MMP_NR_IRQS + 40)



#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 = {

	.irq_base		= IRQ_BOARD_START,

	.irq_base		= MMP_NR_IRQS,

};



static struct i2c_board_info brownstone_twsi1_info[] = {

arch/arm/mach-mmp/flint.c

+2 −1
Original line number Diff line number Diff line
@@ -23,10 +23,11 @@ 
#include <mach/addr-map.h>

#include <mach/mfp-mmp2.h>

#include <mach/mmp2.h>

#include <mach/irqs.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 = {

	/* UART1 */

arch/arm/mach-mmp/gplugd.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static void __init gplugd_init(void) 


MACHINE_START(GPLUGD, "PXA168-based GuruPlug Display (gplugD) Platform")

	.map_io		= mmp_map_io,

	.nr_irqs	= IRQ_BOARD_START,

	.nr_irqs	= MMP_NR_IRQS,

	.init_irq       = pxa168_init_irq,

	.timer          = &pxa168_timer,

	.init_machine   = gplugd_init,