With legacy devices mapping their irqs, we can now switch DT enabled boards to orion irqchip driver.
Signed-off-by: Sebastian Hesselbarth <[email protected]> --- Changelog: v1->v2: - split off DT changes (Suggested by Jason Cooper) - use irqchip_init (Suggested by Jason Gunthorpe) Cc: Grant Likely <[email protected]> Cc: Rob Herring <[email protected]> Cc: Rob Landley <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Russell King <[email protected]> Cc: Arnd Bergmann <[email protected]> Cc: Jason Cooper <[email protected]> Cc: Andrew Lunn <[email protected]> Cc: Jason Gunthorpe <[email protected]> Cc: Thomas Petazzoni <[email protected]> Cc: Gregory Clement <[email protected]> Cc: Ezequiel Garcia <[email protected]> Cc: Jean-Francois Moine <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] --- arch/arm/mach-dove/Kconfig | 1 + arch/arm/mach-dove/Makefile | 4 ++-- arch/arm/mach-dove/board-dt.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-dove/Kconfig b/arch/arm/mach-dove/Kconfig index 36469d8..60d72b4 100644 --- a/arch/arm/mach-dove/Kconfig +++ b/arch/arm/mach-dove/Kconfig @@ -22,6 +22,7 @@ config MACH_CM_A510 config MACH_DOVE_DT bool "Marvell Dove Flattened Device Tree" + select IRQCHIP_ORION select MVEBU_CLK_CORE select MVEBU_CLK_GATING select REGULATOR diff --git a/arch/arm/mach-dove/Makefile b/arch/arm/mach-dove/Makefile index 3f0a858..4780f78 100644 --- a/arch/arm/mach-dove/Makefile +++ b/arch/arm/mach-dove/Makefile @@ -1,5 +1,5 @@ -obj-y += common.o addr-map.o irq.o -obj-$(CONFIG_DOVE_LEGACY) += mpp.o +obj-y += common.o addr-map.o +obj-$(CONFIG_DOVE_LEGACY) += irq.o mpp.o obj-$(CONFIG_PCI) += pcie.o obj-$(CONFIG_MACH_DOVE_DB) += dove-db-setup.o obj-$(CONFIG_MACH_DOVE_DT) += board-dt.o diff --git a/arch/arm/mach-dove/board-dt.c b/arch/arm/mach-dove/board-dt.c index cea65b7..404c993 100644 --- a/arch/arm/mach-dove/board-dt.c +++ b/arch/arm/mach-dove/board-dt.c @@ -11,6 +11,7 @@ #include <linux/init.h> #include <linux/clk-provider.h> #include <linux/clk/mvebu.h> +#include <linux/irqchip.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/of_irq.h> @@ -20,7 +21,6 @@ #include <asm/mach/arch.h> #include <mach/pm.h> #include <plat/common.h> -#include <plat/irq.h> #include <plat/time.h> #include "common.h" @@ -143,7 +143,7 @@ static const char * const dove_dt_board_compat[] = { DT_MACHINE_START(DOVE_DT, "Marvell Dove (Flattened Device Tree)") .map_io = dove_map_io, - .init_irq = orion_dt_init_irq, + .init_irq = irqchip_init, .init_time = dove_legacy_timer_init, .init_machine = dove_dt_init, .restart = dove_restart, -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
