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

Commit 2389d501 authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: plat-versatile: move FPGA irq driver to drivers/irqchip 



This moves the Versatile FPGA interrupt controller driver, used in
the Integrator/AP, Integrator/CP and some Versatile boards, out
of arch/arm/plat-versatile and down to drivers/irqchip where we
have consensus that such drivers belong. The header file is
consequently moved to <linux/platform_data/irq-versatile-fpga.h>.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent da72a66b

arch/arm/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -284,8 +284,8 @@ config ARCH_INTEGRATOR 
	select MULTI_IRQ_HANDLER

	select NEED_MACH_MEMORY_H

	select PLAT_VERSATILE

	select PLAT_VERSATILE_FPGA_IRQ

	select SPARSE_IRQ

	select VERSATILE_FPGA_IRQ

	help

	  Support for ARM's Integrator platform.
@@ -318,7 +318,7 @@ config ARCH_VERSATILE 
	select PLAT_VERSATILE

	select PLAT_VERSATILE_CLCD

	select PLAT_VERSATILE_CLOCK

	select PLAT_VERSATILE_FPGA_IRQ

	select VERSATILE_FPGA_IRQ

	help

	  This enables support for ARM Ltd Versatile board.

arch/arm/mach-integrator/integrator_ap.c

+1 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/clockchips.h>

#include <linux/interrupt.h>

#include <linux/io.h>

#include <linux/irqchip/versatile-fpga.h>

#include <linux/mtd/physmap.h>

#include <linux/clk.h>

#include <linux/platform_data/clk-integrator.h>
@@ -56,8 +57,6 @@ 
#include <asm/mach/pci.h>

#include <asm/mach/time.h>



#include <plat/fpga-irq.h>



#include "common.h"



/*

arch/arm/mach-integrator/integrator_cp.c

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/amba/clcd.h>

#include <linux/amba/mmci.h>

#include <linux/io.h>

#include <linux/irqchip/versatile-fpga.h>

#include <linux/gfp.h>

#include <linux/mtd/physmap.h>

#include <linux/platform_data/clk-integrator.h>
@@ -46,7 +47,6 @@ 
#include <asm/hardware/timer-sp.h>



#include <plat/clcd.h>

#include <plat/fpga-irq.h>

#include <plat/sched_clock.h>



#include "common.h"

arch/arm/mach-versatile/core.c

+1 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/amba/mmci.h>

#include <linux/amba/pl022.h>

#include <linux/io.h>

#include <linux/irqchip/versatile-fpga.h>

#include <linux/gfp.h>

#include <linux/clkdev.h>

#include <linux/mtd/physmap.h>
@@ -51,7 +52,6 @@ 
#include <asm/hardware/timer-sp.h>



#include <plat/clcd.h>

#include <plat/fpga-irq.h>

#include <plat/sched_clock.h>



#include "core.h"

arch/arm/plat-versatile/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -6,15 +6,6 @@ config PLAT_VERSATILE_CLOCK 
config PLAT_VERSATILE_CLCD

	bool



config PLAT_VERSATILE_FPGA_IRQ

	bool

	select IRQ_DOMAIN



config PLAT_VERSATILE_FPGA_IRQ_NR

       int

       default 4

       depends on PLAT_VERSATILE_FPGA_IRQ



config PLAT_VERSATILE_LEDS

	def_bool y if NEW_LEDS

	depends on ARCH_REALVIEW || ARCH_VERSATILE