Commit 6ac6b817 authored by Haojian Zhuang's avatar Haojian Zhuang Committed by Eric Miao
Browse files

ARM: pxa: encode IRQ number into .nr_irqs 



Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@marvell.com>
Acked-by: default avatarAntonio Ospite <ospite@studenti.unina.it>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent 1b43d8ed

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -587,6 +587,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.

arch/arm/mach-pxa/Kconfig

+0 −21
Original line number Diff line number Diff line
@@ -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"
@@ -61,7 +58,6 @@ config ARCH_VIPER 
	select ISA

	select I2C_GPIO

	select HAVE_PWM

	select PXA_HAVE_BOARD_IRQS

	select PXA_HAVE_ISA_IRQS

	select ARCOM_PCMCIA
@@ -69,7 +65,6 @@ config MACH_ARCOM_ZEUS 
	bool "Arcom/Eurotech ZEUS SBC"

	select PXA27x

	select ISA

	select PXA_HAVE_BOARD_IRQS

	select PXA_HAVE_ISA_IRQS

	select ARCOM_PCMCIA
@@ -77,7 +72,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"
@@ -140,13 +134,11 @@ config MACH_INTELMOTE2 
	bool "Intel Mote 2 Platform"

	select PXA27x

	select IWMMXT

	select PXA_HAVE_BOARD_IRQS



config MACH_STARGATE2

	bool "Intel Stargate 2 Platform"

	select PXA27x

	select IWMMXT

	select PXA_HAVE_BOARD_IRQS



config MACH_XCEP

	bool "Iskratel Electronics XCEP"
@@ -206,13 +198,11 @@ 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)"

	select PXA27x

	select IWMMXT

	select PXA_HAVE_BOARD_IRQS



config MACH_PCM990_BASEBOARD

	bool "PHYTEC PCM-990 development board"
@@ -247,7 +237,6 @@ config MACH_COLIBRI_PXA270_INCOME 
	depends on MACH_COLIBRI

	select PXA27x

	select HAVE_PWM

	select PXA_HAVE_BOARD_IRQS



config MACH_COLIBRI300

	bool "Toradex Colibri PXA300/310"
@@ -274,7 +263,6 @@ config MACH_H4700 
	select PXA27x

	select IWMMXT

	select HAVE_PWM

	select PXA_HAVE_BOARD_IRQS



config MACH_H5000

	bool "HP iPAQ h5000"
@@ -289,7 +277,6 @@ config MACH_MAGICIAN 
	select PXA27x

	select IWMMXT

	select HAVE_PWM

	select PXA_HAVE_BOARD_IRQS



config MACH_MIOA701

	bool "Mitac Mio A701 Support"
@@ -307,7 +294,6 @@ config PXA_EZX 
	select PXA27x

	select IWMMXT

	select HAVE_PWM

	select PXA_HAVE_BOARD_IRQS



config MACH_EZX_A780

	bool "Motorola EZX A780"
@@ -478,7 +464,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"
@@ -523,7 +508,6 @@ config MACH_TOSA 
	bool "Enable Sharp SL-6000x (Tosa) Support"

	depends on PXA_SHARPSL

	select PXA25x

	select PXA_HAVE_BOARD_IRQS



config TOSA_BT

	tristate "Control the state of built-in bluetooth chip on Sharp SL-6000"
@@ -552,7 +536,6 @@ config MACH_ICONTROL 
config ARCH_PXA_ESERIES

	bool "PXA based Toshiba e-series PDAs"

	select PXA25x

	select PXA_HAVE_BOARD_IRQS



config MACH_E330

	bool "Toshiba e330"
@@ -606,7 +589,6 @@ config MACH_ZIPIT2 
	bool "Zipit Z2 Handheld"

	select PXA27x

	select HAVE_PWM

	select PXA_HAVE_BOARD_IRQS



endmenu
@@ -693,9 +675,6 @@ config SHARPSL_PM_MAX1111 
	select HWMON

	select SENSORS_MAX1111



config PXA_HAVE_BOARD_IRQS

	bool



config PXA_HAVE_ISA_IRQS

	bool

arch/arm/mach-pxa/balloon3.c

+1 −0
Original line number Diff line number Diff line
@@ -779,6 +779,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,

arch/arm/mach-pxa/cm-x2xx.c

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ 
extern void cmx255_init(void);

extern void cmx270_init(void);



/* reserve IRQs for IT8152 */

#define CMX2XX_NR_IRQS		(IRQ_BOARD_START + 40)



/* virtual addresses for statically mapped regions */

#define CMX2XX_VIRT_BASE	(0xe8000000)

#define CMX2XX_IT8152_VIRT	(CMX2XX_VIRT_BASE)
@@ -514,6 +517,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,

arch/arm/mach-pxa/eseries.c

+7 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 


#include <mach/pxa25x.h>

#include <mach/eseries-gpio.h>

#include <mach/eseries-irq.h>

#include <mach/audio.h>

#include <mach/pxafb.h>

#include <mach/udc.h>
@@ -183,6 +184,7 @@ MACHINE_START(E330, "Toshiba e330") 
	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,

	.boot_params	= 0xa0000100,

	.map_io		= pxa_map_io,

	.nr_irqs	= ESERIES_NR_IRQS,

	.init_irq	= pxa25x_init_irq,

	.fixup		= eseries_fixup,

	.init_machine	= e330_init,
@@ -233,6 +235,7 @@ MACHINE_START(E350, "Toshiba e350") 
	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,

	.boot_params	= 0xa0000100,

	.map_io		= pxa_map_io,

	.nr_irqs	= ESERIES_NR_IRQS,

	.init_irq	= pxa25x_init_irq,

	.fixup		= eseries_fixup,

	.init_machine	= e350_init,
@@ -356,6 +359,7 @@ MACHINE_START(E400, "Toshiba e400") 
	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,

	.boot_params	= 0xa0000100,

	.map_io		= pxa_map_io,

	.nr_irqs	= ESERIES_NR_IRQS,

	.init_irq	= pxa25x_init_irq,

	.fixup		= eseries_fixup,

	.init_machine	= e400_init,
@@ -545,6 +549,7 @@ MACHINE_START(E740, "Toshiba e740") 
	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,

	.boot_params	= 0xa0000100,

	.map_io		= pxa_map_io,

	.nr_irqs	= ESERIES_NR_IRQS,

	.init_irq	= pxa25x_init_irq,

	.fixup		= eseries_fixup,

	.init_machine	= e740_init,
@@ -737,6 +742,7 @@ MACHINE_START(E750, "Toshiba e750") 
	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,

	.boot_params	= 0xa0000100,

	.map_io		= pxa_map_io,

	.nr_irqs	= ESERIES_NR_IRQS,

	.init_irq	= pxa25x_init_irq,

	.fixup		= eseries_fixup,

	.init_machine	= e750_init,
@@ -933,6 +939,7 @@ MACHINE_START(E800, "Toshiba e800") 
	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,

	.boot_params	= 0xa0000100,

	.map_io		= pxa_map_io,

	.nr_irqs	= ESERIES_NR_IRQS,

	.init_irq	= pxa25x_init_irq,

	.fixup		= eseries_fixup,

	.init_machine	= e800_init,