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

Commit afed2a26 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

ARM: tegra2: convert to CONFIG_MULTI_IRQ_HANDLER 



Convert the tegra2 platforms to be using the gic_handle_irq
function as their primary interrupt handler.

Tested on harmony.

Cc: Colin Cross <ccross@android.com>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Acked-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 4e44d2cb

arch/arm/mach-tegra/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ config ARCH_TEGRA_2x_SOC 
	select USB_ARCH_HAS_EHCI if USB_SUPPORT

	select USB_ULPI if USB_SUPPORT

	select USB_ULPI_VIEWPORT if USB_SUPPORT

	select MULTI_IRQ_HANDLER

	help

	  Support for NVIDIA Tegra AP20 and T20 processors, based on the

	  ARM CortexA9MP CPU and the ARM PL310 L2 cache controller

arch/arm/mach-tegra/board-dt.c

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/i2c.h>

#include <linux/i2c-tegra.h>



#include <asm/hardware/gic.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/time.h>
@@ -130,6 +131,7 @@ DT_MACHINE_START(TEGRA_DT, "nVidia Tegra (Flattened Device Tree)") 
	.map_io		= tegra_map_common_io,

	.init_early	= tegra_init_early,

	.init_irq	= tegra_init_irq,

	.handle_irq	= gic_handle_irq,

	.timer		= &tegra_timer,

	.init_machine	= tegra_dt_init,

	.dt_compat	= tegra_dt_board_compat,

arch/arm/mach-tegra/board-harmony.c

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include <asm/hardware/gic.h>

#include <asm/setup.h>



#include <mach/tegra_wm8903_pdata.h>
@@ -187,6 +188,7 @@ MACHINE_START(HARMONY, "harmony") 
	.map_io         = tegra_map_common_io,

	.init_early	= tegra_init_early,

	.init_irq       = tegra_init_irq,

	.handle_irq	= gic_handle_irq,

	.timer          = &tegra_timer,

	.init_machine   = tegra_harmony_init,

MACHINE_END

arch/arm/mach-tegra/board-paz00.c

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/gpio.h>

#include <linux/rfkill-gpio.h>



#include <asm/hardware/gic.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/time.h>
@@ -190,6 +191,7 @@ MACHINE_START(PAZ00, "Toshiba AC100 / Dynabook AZ") 
	.map_io         = tegra_map_common_io,

	.init_early	= tegra_init_early,

	.init_irq       = tegra_init_irq,

	.handle_irq	= gic_handle_irq,

	.timer          = &tegra_timer,

	.init_machine   = tegra_paz00_init,

MACHINE_END

arch/arm/mach-tegra/board-seaboard.c

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 


#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/hardware/gic.h>



#include "board.h"

#include "board-seaboard.h"
@@ -284,6 +285,7 @@ MACHINE_START(SEABOARD, "seaboard") 
	.map_io         = tegra_map_common_io,

	.init_early     = tegra_init_early,

	.init_irq       = tegra_init_irq,

	.handle_irq	= gic_handle_irq,

	.timer          = &tegra_timer,

	.init_machine   = tegra_seaboard_init,

MACHINE_END
@@ -293,6 +295,7 @@ MACHINE_START(KAEN, "kaen") 
	.map_io         = tegra_map_common_io,

	.init_early     = tegra_init_early,

	.init_irq       = tegra_init_irq,

	.handle_irq	= gic_handle_irq,

	.timer          = &tegra_timer,

	.init_machine   = tegra_kaen_init,

MACHINE_END
@@ -302,6 +305,7 @@ MACHINE_START(WARIO, "wario") 
	.map_io         = tegra_map_common_io,

	.init_early     = tegra_init_early,

	.init_irq       = tegra_init_irq,

	.handle_irq	= gic_handle_irq,

	.timer          = &tegra_timer,

	.init_machine   = tegra_wario_init,

MACHINE_END