Commit 9339d432 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper
Browse files

irqchip: move IRQ driver for Armada 370/XP 



When the Marvell Armada 370/XP support was included in the kernel, the
drivers/irqchip/ directory didn't exist and the minimal infrastructure
in it also didn't exist. Now that we have those things in place, we
move the Armada 370/XP IRQ controller driver from
arch/arm/mach-mvebu/irq-armada-370-xp.c to
drivers/irqchip/irq-armada-370-xp.c.

Note in order to reduce code movement and therefore ease the review of
this patch, we intentionally introduce a forward declaration of
armada_370_xp_handle_irq(). It is in fact not needed because this
handler can now simply be implemented before
armada_370_xp_mpic_of_init(). That will be done in the next commit.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent e33369cb

arch/arm/mach-mvebu/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,6 +5,6 @@ AFLAGS_coherency_ll.o := -Wa,-march=armv7-a 


obj-y				 += system-controller.o

obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o

obj-$(CONFIG_ARCH_MVEBU)	 += addr-map.o coherency.o coherency_ll.o pmsu.o irq-armada-370-xp.o 

obj-$(CONFIG_ARCH_MVEBU)	 += addr-map.o coherency.o coherency_ll.o pmsu.o

obj-$(CONFIG_SMP)                += platsmp.o headsmp.o

obj-$(CONFIG_HOTPLUG_CPU)        += hotplug.o

arch/arm/mach-mvebu/armada-370-xp.c

+2 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/time-armada-370-xp.h>

#include <linux/clk/mvebu.h>

#include <linux/dma-mapping.h>

#include <linux/irqchip.h>

#include <asm/hardware/cache-l2x0.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>
@@ -77,8 +78,7 @@ DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)") 
	.init_machine	= armada_370_xp_dt_init,

	.map_io		= armada_370_xp_map_io,

	.init_early	= armada_370_xp_init_early,

	.init_irq	= armada_370_xp_init_irq,

	.handle_irq     = armada_370_xp_handle_irq,

	.init_irq	= irqchip_init,

	.init_time	= armada_370_xp_timer_and_clk_init,

	.restart	= mvebu_restart,

	.dt_compat	= armada_370_xp_dt_compat,

drivers/irqchip/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ obj-$(CONFIG_IRQCHIP) += irqchip.o 


obj-$(CONFIG_ARCH_BCM2835)		+= irq-bcm2835.o

obj-$(CONFIG_ARCH_EXYNOS)		+= exynos-combiner.o

obj-$(CONFIG_ARCH_MVEBU)		+= irq-armada-370-xp.o

obj-$(CONFIG_METAG)			+= irq-metag-ext.o

obj-$(CONFIG_METAG_PERFCOUNTER_IRQS)	+= irq-metag.o

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

arch/arm/mach-mvebu/irq-armada-370-xp.c→drivers/irqchip/irq-armada-370-xp.c

+11 −11
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ 
#include <asm/mach/arch.h>

#include <asm/exception.h>

#include <asm/smp_plat.h>

#include <asm/mach/irq.h>



#include "irqchip.h"



/* Interrupt Controller Registers Map */

#define ARMADA_370_XP_INT_SET_MASK_OFFS		(0x48)
@@ -202,6 +205,9 @@ static struct irq_domain_ops armada_370_xp_mpic_irq_ops = { 
	.xlate = irq_domain_xlate_onecell,

};



static asmlinkage void __exception_irq_entry

armada_370_xp_handle_irq(struct pt_regs *regs);



static int __init armada_370_xp_mpic_of_init(struct device_node *node,

					     struct device_node *parent)

{
@@ -237,11 +243,13 @@ static int __init armada_370_xp_mpic_of_init(struct device_node *node, 


#endif



	set_handle_irq(armada_370_xp_handle_irq);



	return 0;

}



asmlinkage void __exception_irq_entry armada_370_xp_handle_irq(struct pt_regs

							       *regs)

static asmlinkage void __exception_irq_entry

armada_370_xp_handle_irq(struct pt_regs *regs)

{

	u32 irqstat, irqnr;
@@ -283,12 +291,4 @@ asmlinkage void __exception_irq_entry armada_370_xp_handle_irq(struct pt_regs 
	} while (1);

}



static const struct of_device_id mpic_of_match[] __initconst = {

	{.compatible = "marvell,mpic", .data = armada_370_xp_mpic_of_init},

	{},

};



void __init armada_370_xp_init_irq(void)

{

	of_irq_init(mpic_of_match);

}
 
IRQCHIP_DECLARE(armada_370_xp_mpic, "marvell,mpic", armada_370_xp_mpic_of_init);

CRA Git | Maintained and supported by SUSTech CRA and CCSE