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

Commit 0bd86961 authored by Haojian Zhuang's avatar Haojian Zhuang Committed by Eric Miao
Browse files

ARM: mmp: support sparse irq 



Add sparse IRQ support in ARCH_MMP.

Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent 20266df5

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -510,6 +510,7 @@ config ARCH_MMP 
	select GENERIC_CLOCKEVENTS

	select TICK_ONESHOT

	select PLAT_PXA

	select SPARSE_IRQ

	help

	  Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line.

arch/arm/mach-mmp/aspenite.c

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/nand.h>

#include <linux/interrupt.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>
@@ -239,6 +240,7 @@ MACHINE_START(ASPENITE, "PXA168-based Aspenite Development Platform") 
	.phys_io        = APB_PHYS_BASE,

	.io_pg_offst    = (APB_VIRT_BASE >> 18) & 0xfffc,

	.map_io		= mmp_map_io,

	.nr_irqs	= IRQ_BOARD_START,

	.init_irq       = pxa168_init_irq,

	.timer          = &pxa168_timer,

	.init_machine   = common_init,
@@ -248,6 +250,7 @@ MACHINE_START(ZYLONITE2, "PXA168-based Zylonite2 Development Platform") 
	.phys_io        = APB_PHYS_BASE,

	.io_pg_offst    = (APB_VIRT_BASE >> 18) & 0xfffc,

	.map_io		= mmp_map_io,

	.nr_irqs	= IRQ_BOARD_START,

	.init_irq       = pxa168_init_irq,

	.timer          = &pxa168_timer,

	.init_machine   = common_init,

arch/arm/mach-mmp/flint.c

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/smc91x.h>

#include <linux/io.h>

#include <linux/gpio.h>

#include <linux/interrupt.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>
@@ -25,6 +26,8 @@ 


#include "common.h"



#define FLINT_NR_IRQS	(IRQ_BOARD_START + 48)



static unsigned long flint_pin_config[] __initdata = {

	/* UART1 */

	GPIO45_UART1_RXD,
@@ -116,6 +119,7 @@ MACHINE_START(FLINT, "Flint Development Platform") 
	.phys_io        = APB_PHYS_BASE,

	.io_pg_offst    = (APB_VIRT_BASE >> 18) & 0xfffc,

	.map_io		= mmp_map_io,

	.nr_irqs	= FLINT_NR_IRQS,

	.init_irq       = mmp2_init_irq,

	.timer          = &mmp2_timer,

	.init_machine   = flint_init,

arch/arm/mach-mmp/include/mach/irqs.h

+1 −3
Original line number Diff line number Diff line
@@ -222,10 +222,8 @@ 
#define IRQ_GPIO_NUM			192

#define IRQ_GPIO(x)			(IRQ_GPIO_START + (x))



/* Board IRQ - 64 by default, increase if not enough */

#define IRQ_BOARD_START			(IRQ_GPIO_START + IRQ_GPIO_NUM)

#define IRQ_BOARD_END			(IRQ_BOARD_START + 64)



#define NR_IRQS				(IRQ_BOARD_END)

#define NR_IRQS				(IRQ_BOARD_START)



#endif /* __ASM_MACH_IRQS_H */

arch/arm/mach-mmp/jasper.c

+4 −1
Original line number Diff line number Diff line
@@ -18,16 +18,18 @@ 
#include <linux/regulator/machine.h>

#include <linux/regulator/max8649.h>

#include <linux/mfd/max8925.h>

#include <linux/interrupt.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <mach/addr-map.h>

#include <mach/mfp-mmp2.h>

#include <mach/mmp2.h>

#include <mach/irqs.h>



#include "common.h"



#define JASPER_NR_IRQS		(IRQ_BOARD_START + 48)



static unsigned long jasper_pin_config[] __initdata = {

	/* UART1 */

	GPIO29_UART1_RXD,
@@ -137,6 +139,7 @@ MACHINE_START(MARVELL_JASPER, "Jasper Development Platform") 
	.phys_io        = APB_PHYS_BASE,

	.io_pg_offst    = (APB_VIRT_BASE >> 18) & 0xfffc,

	.map_io		= mmp_map_io,

	.nr_irqs	= JASPER_NR_IRQS,

	.init_irq       = mmp2_init_irq,

	.timer          = &mmp2_timer,

	.init_machine   = jasper_init,