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

Commit 6c046e40 authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'irqchip/gic-vic-move' of... 

Merge branch 'irqchip/gic-vic-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into for-arm-soc/virt/mach
parents 0d0ffa94 9e47b8bf

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -4216,6 +4216,7 @@ M: Thomas Gleixner <tglx@linutronix.de> 
S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core

F:	kernel/irq/

F:	drivers/irqchip/



IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)

M:	Benjamin Herrenschmidt <benh@kernel.crashing.org>

arch/arm/common/Kconfig

+0 −23
Original line number Diff line number Diff line 
config ARM_GIC

	bool

	select IRQ_DOMAIN

	select MULTI_IRQ_HANDLER



config GIC_NON_BANKED

	bool



config ARM_VIC

	bool

	select IRQ_DOMAIN

	select MULTI_IRQ_HANDLER



config ARM_VIC_NR

	int

	default 4 if ARCH_S5PV210

	default 3 if ARCH_S5PC100

	default 2

	depends on ARM_VIC

	help

	  The maximum number of VICs available in the system, for

	  power management.



config ICST

	bool

arch/arm/common/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 
# Makefile for the linux kernel.

#



obj-$(CONFIG_ARM_GIC)		+= gic.o

obj-$(CONFIG_ARM_VIC)		+= vic.o

obj-$(CONFIG_ICST)		+= icst.o

obj-$(CONFIG_SA1111)		+= sa1111.o

obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o

arch/arm/include/asm/mach/irq.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ extern int show_fiq_list(struct seq_file *, int); 


#ifdef CONFIG_MULTI_IRQ_HANDLER

extern void (*handle_arch_irq)(struct pt_regs *);

extern void set_handle_irq(void (*handle_irq)(struct pt_regs *));

#endif



/*

arch/arm/kernel/irq.c

+10 −0
Original line number Diff line number Diff line
@@ -117,6 +117,16 @@ void __init init_IRQ(void) 
	machine_desc->init_irq();

}



#ifdef CONFIG_MULTI_IRQ_HANDLER

void __init set_handle_irq(void (*handle_irq)(struct pt_regs *))

{

	if (handle_arch_irq)

		return;



	handle_arch_irq = handle_irq;

}

#endif



#ifdef CONFIG_SPARSE_IRQ

int __init arch_probe_nr_irqs(void)

{