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

Commit 4e0a1b8c authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: mxs: select MULTI_IRQ_HANDLER 



As part of multi-platform effort, let's enable MULTI_IRQ_HANDLER for
mach-mxs and remove entry-macro.S.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent eeca6e60

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -489,6 +489,7 @@ config ARCH_MXS 
	select CLKSRC_MMIO

	select COMMON_CLK

	select HAVE_CLK_PREPARE

	select MULTI_IRQ_HANDLER

	select PINCTRL

	select USE_OF

	help

arch/arm/mach-mxs/icoll.c

+17 −1
Original line number Diff line number Diff line
@@ -20,13 +20,14 @@ 
#include <linux/init.h>

#include <linux/irq.h>

#include <linux/io.h>



#include <asm/exception.h>

#include <mach/mxs.h>

#include <mach/common.h>



#define HW_ICOLL_VECTOR				0x0000

#define HW_ICOLL_LEVELACK			0x0010

#define HW_ICOLL_CTRL				0x0020

#define HW_ICOLL_STAT_OFFSET			0x0070

#define HW_ICOLL_INTERRUPTn_SET(n)		(0x0124 + (n) * 0x10)

#define HW_ICOLL_INTERRUPTn_CLR(n)		(0x0128 + (n) * 0x10)

#define BM_ICOLL_INTERRUPTn_ENABLE		0x00000004
@@ -63,6 +64,21 @@ static struct irq_chip mxs_icoll_chip = { 
	.irq_unmask = icoll_unmask_irq,

};



asmlinkage void __exception_irq_entry icoll_handle_irq(struct pt_regs *regs)

{

	u32 irqnr;



	do {

		irqnr = __raw_readl(icoll_base + HW_ICOLL_STAT_OFFSET);

		if (irqnr != 0x7f) {

			__raw_writel(irqnr, icoll_base + HW_ICOLL_VECTOR);

			handle_IRQ(irqnr, regs);

			continue;

		}

		break;

	} while (1);

}



void __init icoll_init_irq(void)

{

	int i;

arch/arm/mach-mxs/include/mach/common.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ extern void mx28_map_io(void); 
extern void mx28_init_irq(void);



extern void icoll_init_irq(void);

extern void icoll_handle_irq(struct pt_regs *);



extern struct platform_device *mxs_add_dma(const char *devid,

						resource_size_t base);

arch/arm/mach-mxs/include/mach/entry-macro.S

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
/*

 * Low-level IRQ helper macros for Freescale MXS-based

 *

 * Copyright (C) 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License along

 * with this program; if not, write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 */



#include <mach/mxs.h>



#define MXS_ICOLL_VBASE		MXS_IO_ADDRESS(MXS_ICOLL_BASE_ADDR)

#define HW_ICOLL_STAT_OFFSET	0x70



	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp

	ldr	\irqnr, [\base, #HW_ICOLL_STAT_OFFSET]

	cmp	\irqnr, #0x7F

	strne	\irqnr, [\base]

	moveqs	\irqnr, #0

	.endm



	.macro  get_irqnr_preamble, base, tmp

	ldr	\base, =MXS_ICOLL_VBASE

	.endm

arch/arm/mach-mxs/mach-mxs.c

+2 −0
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ static const char *imx28_dt_compat[] __initdata = { 
DT_MACHINE_START(IMX23, "Freescale i.MX23 (Device Tree)")

	.map_io		= mx23_map_io,

	.init_irq	= mxs_dt_init_irq,

	.handle_irq	= icoll_handle_irq,

	.timer		= &imx23_timer,

	.init_machine	= mxs_machine_init,

	.dt_compat	= imx23_dt_compat,
@@ -303,6 +304,7 @@ MACHINE_END 
DT_MACHINE_START(IMX28, "Freescale i.MX28 (Device Tree)")

	.map_io		= mx28_map_io,

	.init_irq	= mxs_dt_init_irq,

	.handle_irq	= icoll_handle_irq,

	.timer		= &imx28_timer,

	.init_machine	= mxs_machine_init,

	.dt_compat	= imx28_dt_compat,