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

Commit 44430ec0 authored by Rob Herring's avatar Rob Herring
Browse files

irqchip: Move ARM VIC to drivers/irqchip 



Now that we have drivers/irqchip, move VIC irqchip to drivers/irqchip.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
parent 48cf83dc

arch/arm/common/Kconfig

+0 −15
Original line number Original line Diff line number Diff line 
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

config ICST

	bool

	bool

arch/arm/common/Makefile

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

# Makefile for the linux kernel.

#

#





obj-$(CONFIG_ARM_VIC)		+= vic.o

obj-$(CONFIG_ICST)		+= icst.o

obj-$(CONFIG_ICST)		+= icst.o

obj-$(CONFIG_SA1111)		+= sa1111.o

obj-$(CONFIG_SA1111)		+= sa1111.o

obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o

obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o

drivers/irqchip/Kconfig

+15 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,21 @@ config ARM_GIC 
config GIC_NON_BANKED

config GIC_NON_BANKED

	bool

	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 VERSATILE_FPGA_IRQ

config VERSATILE_FPGA_IRQ

	bool

	bool

	select IRQ_DOMAIN

	select IRQ_DOMAIN

drivers/irqchip/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -4,4 +4,5 @@ obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o 
obj-$(CONFIG_ARCH_SUNXI)		+= irq-sunxi.o

obj-$(CONFIG_ARCH_SUNXI)		+= irq-sunxi.o

obj-$(CONFIG_ARCH_SPEAR3XX)		+= spear-shirq.o

obj-$(CONFIG_ARCH_SPEAR3XX)		+= spear-shirq.o

obj-$(CONFIG_ARM_GIC)			+= irq-gic.o

obj-$(CONFIG_ARM_GIC)			+= irq-gic.o

obj-$(CONFIG_ARM_VIC)			+= irq-vic.o

obj-$(CONFIG_VERSATILE_FPGA_IRQ)	+= irq-versatile-fpga.o
 
obj-$(CONFIG_VERSATILE_FPGA_IRQ)	+= irq-versatile-fpga.o

arch/arm/common/vic.c→drivers/irqchip/irq-vic.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -35,6 +35,8 @@ 
#include <asm/mach/irq.h>

#include <asm/mach/irq.h>

#include <asm/hardware/vic.h>

#include <asm/hardware/vic.h>





#include "irqchip.h"



#define VIC_IRQ_STATUS			0x00

#define VIC_IRQ_STATUS			0x00

#define VIC_FIQ_STATUS			0x04

#define VIC_FIQ_STATUS			0x04

#define VIC_INT_SELECT			0x0c	/* 1 = FIQ, 0 = IRQ */

#define VIC_INT_SELECT			0x0c	/* 1 = FIQ, 0 = IRQ */
@@ -481,4 +483,7 @@ int __init vic_of_init(struct device_node *node, struct device_node *parent) 




	return 0;

	return 0;

}

}

IRQCHIP_DECLARE(arm_pl190_vic, "arm,pl190-vic", vic_of_init);

IRQCHIP_DECLARE(arm_pl192_vic, "arm,pl192-vic", vic_of_init);

IRQCHIP_DECLARE(arm_versatile_vic, "arm,versatile-vic", vic_of_init);

#endif /* CONFIG OF */
 
#endif /* CONFIG OF */