Commit a4fe292f authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: u300: convert to sparse IRQs 



This converts the U300 to use sparse IRQs, which is simple now
that the number of machines are reduced.

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

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -937,6 +937,7 @@ config ARCH_U300 
	select COMMON_CLK

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select SPARSE_IRQ

	help

	  Support for ST-Ericsson U300 series mobile platforms.

arch/arm/mach-u300/core.c

+2 −1
Original line number Diff line number Diff line
@@ -38,13 +38,13 @@ 
#include <asm/memory.h>

#include <asm/hardware/vic.h>

#include <asm/mach/map.h>

#include <asm/mach/irq.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>



#include <mach/coh901318.h>

#include <mach/hardware.h>

#include <mach/syscon.h>

#include <mach/irqs.h>



#include "timer.h"

#include "spi.h"
@@ -1807,6 +1807,7 @@ MACHINE_START(U300, "Ericsson AB U335 S335/B335 Prototype Board") 
	/* Maintainer: Linus Walleij <linus.walleij@stericsson.com> */

	.atag_offset	= 0x100,

	.map_io		= u300_map_io,

	.nr_irqs	= NR_IRQS_U300,

	.init_irq	= u300_init_irq,

	.handle_irq	= vic_handle_irq,

	.timer		= &u300_timer,

arch/arm/mach-u300/include/mach/irqs.h

+1 −1
Original line number Diff line number Diff line
@@ -85,6 +85,6 @@ 
#define IRQ_U300_GPIO_END		(U300_VIC_IRQS_END)

#endif



#define NR_IRQS				(IRQ_U300_GPIO_END - IRQ_U300_INTCON0_START)

#define NR_IRQS_U300			(IRQ_U300_GPIO_END - IRQ_U300_INTCON0_START)



#endif

arch/arm/mach-u300/timer.c

+2 −1
Original line number Diff line number Diff line
@@ -17,14 +17,15 @@ 
#include <linux/io.h>

#include <linux/clk.h>

#include <linux/err.h>

#include <linux/irq.h>



#include <mach/hardware.h>

#include <mach/irqs.h>



/* Generic stuff */

#include <asm/sched_clock.h>

#include <asm/mach/map.h>

#include <asm/mach/time.h>

#include <asm/mach/irq.h>



#include "timer.h"