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

Commit c5a4d6b0 authored by Stephen Warren's avatar Stephen Warren
Browse files

ARM: tegra: select SPARSE_IRQ 



SPARSE_IRQ is required for single zImage support.

With this enabled, we can delete <mach/irqs.h>. This requires removing
one unnecessary include of that file, and hard-coding the PCIe IRQ into
the PCIe driver. This is a hack that will be dealt with as part of
converting the PCIe driver into a true DT-supporting driver.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
parent 3a04931e

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -644,6 +644,7 @@ config ARCH_TEGRA 
	select HAVE_CLK

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	select SPARSE_IRQ

	select USE_OF

	help

	  This enables support for NVIDIA Tegra based systems (Tegra APX,

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

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

 * arch/arm/mach-tegra/include/mach/irqs.h

 *

 * Copyright (C) 2010 Google, Inc.

 *

 * Author:

 *	Colin Cross <ccross@google.com>

 *	Erik Gilling <konkers@google.com>

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * may be copied, distributed, and modified under those terms.

 *

 * 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.

 *

 */



#ifndef __MACH_TEGRA_IRQS_H

#define __MACH_TEGRA_IRQS_H



#define INT_GIC_BASE			0



#define IRQ_LOCALTIMER                  29



/* Primary Interrupt Controller */

#define INT_PRI_BASE			(INT_GIC_BASE + 32)

#define INT_TMR1			(INT_PRI_BASE + 0)

#define INT_TMR2			(INT_PRI_BASE + 1)

#define INT_RTC				(INT_PRI_BASE + 2)

#define INT_I2S2			(INT_PRI_BASE + 3)

#define INT_SHR_SEM_INBOX_IBF		(INT_PRI_BASE + 4)

#define INT_SHR_SEM_INBOX_IBE		(INT_PRI_BASE + 5)

#define INT_SHR_SEM_OUTBOX_IBF		(INT_PRI_BASE + 6)

#define INT_SHR_SEM_OUTBOX_IBE		(INT_PRI_BASE + 7)

#define INT_VDE_UCQ_ERROR		(INT_PRI_BASE + 8)

#define INT_VDE_SYNC_TOKEN		(INT_PRI_BASE + 9)

#define INT_VDE_BSE_V			(INT_PRI_BASE + 10)

#define INT_VDE_BSE_A			(INT_PRI_BASE + 11)

#define INT_VDE_SXE			(INT_PRI_BASE + 12)

#define INT_I2S1			(INT_PRI_BASE + 13)

#define INT_SDMMC1			(INT_PRI_BASE + 14)

#define INT_SDMMC2			(INT_PRI_BASE + 15)

#define INT_XIO				(INT_PRI_BASE + 16)

#define INT_VDE				(INT_PRI_BASE + 17)

#define INT_AVP_UCQ			(INT_PRI_BASE + 18)

#define INT_SDMMC3			(INT_PRI_BASE + 19)

#define INT_USB				(INT_PRI_BASE + 20)

#define INT_USB2			(INT_PRI_BASE + 21)

#define INT_PRI_RES_22			(INT_PRI_BASE + 22)

#define INT_EIDE			(INT_PRI_BASE + 23)

#define INT_NANDFLASH			(INT_PRI_BASE + 24)

#define INT_VCP				(INT_PRI_BASE + 25)

#define INT_APB_DMA			(INT_PRI_BASE + 26)

#define INT_AHB_DMA			(INT_PRI_BASE + 27)

#define INT_GNT_0			(INT_PRI_BASE + 28)

#define INT_GNT_1			(INT_PRI_BASE + 29)

#define INT_OWR				(INT_PRI_BASE + 30)

#define INT_SDMMC4			(INT_PRI_BASE + 31)



/* Secondary Interrupt Controller */

#define INT_SEC_BASE			(INT_PRI_BASE + 32)

#define INT_GPIO1			(INT_SEC_BASE + 0)

#define INT_GPIO2			(INT_SEC_BASE + 1)

#define INT_GPIO3			(INT_SEC_BASE + 2)

#define INT_GPIO4			(INT_SEC_BASE + 3)

#define INT_UARTA			(INT_SEC_BASE + 4)

#define INT_UARTB			(INT_SEC_BASE + 5)

#define INT_I2C				(INT_SEC_BASE + 6)

#define INT_SPI				(INT_SEC_BASE + 7)

#define INT_TWC				(INT_SEC_BASE + 8)

#define INT_TMR3			(INT_SEC_BASE + 9)

#define INT_TMR4			(INT_SEC_BASE + 10)

#define INT_FLOW_RSM0			(INT_SEC_BASE + 11)

#define INT_FLOW_RSM1			(INT_SEC_BASE + 12)

#define INT_SPDIF			(INT_SEC_BASE + 13)

#define INT_UARTC			(INT_SEC_BASE + 14)

#define INT_MIPI			(INT_SEC_BASE + 15)

#define INT_EVENTA			(INT_SEC_BASE + 16)

#define INT_EVENTB			(INT_SEC_BASE + 17)

#define INT_EVENTC			(INT_SEC_BASE + 18)

#define INT_EVENTD			(INT_SEC_BASE + 19)

#define INT_VFIR			(INT_SEC_BASE + 20)

#define INT_DVC				(INT_SEC_BASE + 21)

#define INT_SYS_STATS_MON		(INT_SEC_BASE + 22)

#define INT_GPIO5			(INT_SEC_BASE + 23)

#define INT_CPU0_PMU_INTR		(INT_SEC_BASE + 24)

#define INT_CPU1_PMU_INTR		(INT_SEC_BASE + 25)

#define INT_SEC_RES_26			(INT_SEC_BASE + 26)

#define INT_S_LINK1			(INT_SEC_BASE + 27)

#define INT_APB_DMA_COP			(INT_SEC_BASE + 28)

#define INT_AHB_DMA_COP			(INT_SEC_BASE + 29)

#define INT_DMA_TX			(INT_SEC_BASE + 30)

#define INT_DMA_RX			(INT_SEC_BASE + 31)



/* Tertiary Interrupt Controller */

#define INT_TRI_BASE			(INT_SEC_BASE + 32)

#define INT_HOST1X_COP_SYNCPT		(INT_TRI_BASE + 0)

#define INT_HOST1X_MPCORE_SYNCPT	(INT_TRI_BASE + 1)

#define INT_HOST1X_COP_GENERAL		(INT_TRI_BASE + 2)

#define INT_HOST1X_MPCORE_GENERAL	(INT_TRI_BASE + 3)

#define INT_MPE_GENERAL			(INT_TRI_BASE + 4)

#define INT_VI_GENERAL			(INT_TRI_BASE + 5)

#define INT_EPP_GENERAL			(INT_TRI_BASE + 6)

#define INT_ISP_GENERAL			(INT_TRI_BASE + 7)

#define INT_2D_GENERAL			(INT_TRI_BASE + 8)

#define INT_DISPLAY_GENERAL		(INT_TRI_BASE + 9)

#define INT_DISPLAY_B_GENERAL		(INT_TRI_BASE + 10)

#define INT_HDMI			(INT_TRI_BASE + 11)

#define INT_TVO_GENERAL			(INT_TRI_BASE + 12)

#define INT_MC_GENERAL			(INT_TRI_BASE + 13)

#define INT_EMC_GENERAL			(INT_TRI_BASE + 14)

#define INT_TRI_RES_15			(INT_TRI_BASE + 15)

#define INT_TRI_RES_16			(INT_TRI_BASE + 16)

#define INT_AC97			(INT_TRI_BASE + 17)

#define INT_SPI_2			(INT_TRI_BASE + 18)

#define INT_SPI_3			(INT_TRI_BASE + 19)

#define INT_I2C2			(INT_TRI_BASE + 20)

#define INT_KBC				(INT_TRI_BASE + 21)

#define INT_EXTERNAL_PMU		(INT_TRI_BASE + 22)

#define INT_GPIO6			(INT_TRI_BASE + 23)

#define INT_TVDAC			(INT_TRI_BASE + 24)

#define INT_GPIO7			(INT_TRI_BASE + 25)

#define INT_UARTD			(INT_TRI_BASE + 26)

#define INT_UARTE			(INT_TRI_BASE + 27)

#define INT_I2C3			(INT_TRI_BASE + 28)

#define INT_SPI_4			(INT_TRI_BASE + 29)

#define INT_TRI_RES_30			(INT_TRI_BASE + 30)

#define INT_SW_RESERVED			(INT_TRI_BASE + 31)



/* Quaternary Interrupt Controller */

#define INT_QUAD_BASE			(INT_TRI_BASE + 32)

#define INT_SNOR			(INT_QUAD_BASE + 0)

#define INT_USB3			(INT_QUAD_BASE + 1)

#define INT_PCIE_INTR			(INT_QUAD_BASE + 2)

#define INT_PCIE_MSI			(INT_QUAD_BASE + 3)

#define INT_QUAD_RES_4			(INT_QUAD_BASE + 4)

#define INT_QUAD_RES_5			(INT_QUAD_BASE + 5)

#define INT_QUAD_RES_6			(INT_QUAD_BASE + 6)

#define INT_QUAD_RES_7			(INT_QUAD_BASE + 7)

#define INT_APB_DMA_CH0			(INT_QUAD_BASE + 8)

#define INT_APB_DMA_CH1			(INT_QUAD_BASE + 9)

#define INT_APB_DMA_CH2			(INT_QUAD_BASE + 10)

#define INT_APB_DMA_CH3			(INT_QUAD_BASE + 11)

#define INT_APB_DMA_CH4			(INT_QUAD_BASE + 12)

#define INT_APB_DMA_CH5			(INT_QUAD_BASE + 13)

#define INT_APB_DMA_CH6			(INT_QUAD_BASE + 14)

#define INT_APB_DMA_CH7			(INT_QUAD_BASE + 15)

#define INT_APB_DMA_CH8			(INT_QUAD_BASE + 16)

#define INT_APB_DMA_CH9			(INT_QUAD_BASE + 17)

#define INT_APB_DMA_CH10		(INT_QUAD_BASE + 18)

#define INT_APB_DMA_CH11		(INT_QUAD_BASE + 19)

#define INT_APB_DMA_CH12		(INT_QUAD_BASE + 20)

#define INT_APB_DMA_CH13		(INT_QUAD_BASE + 21)

#define INT_APB_DMA_CH14		(INT_QUAD_BASE + 22)

#define INT_APB_DMA_CH15		(INT_QUAD_BASE + 23)

#define INT_QUAD_RES_24			(INT_QUAD_BASE + 24)

#define INT_QUAD_RES_25			(INT_QUAD_BASE + 25)

#define INT_QUAD_RES_26			(INT_QUAD_BASE + 26)

#define INT_QUAD_RES_27			(INT_QUAD_BASE + 27)

#define INT_QUAD_RES_28			(INT_QUAD_BASE + 28)

#define INT_QUAD_RES_29			(INT_QUAD_BASE + 29)

#define INT_QUAD_RES_30			(INT_QUAD_BASE + 30)

#define INT_QUAD_RES_31			(INT_QUAD_BASE + 31)



/* Tegra30 has 5 banks of 32 IRQs */

#define INT_MAIN_NR			(32 * 5)

#define INT_GPIO_BASE			(INT_PRI_BASE + INT_MAIN_NR)



/* Tegra30 has 8 banks of 32 GPIOs */

#define INT_GPIO_NR			(32 * 8)



#define TEGRA_NR_IRQS			(INT_GPIO_BASE + INT_GPIO_NR)



#define INT_BOARD_BASE			TEGRA_NR_IRQS

#define NR_BOARD_IRQS			32



#define NR_IRQS				(INT_BOARD_BASE + NR_BOARD_IRQS)



#endif

arch/arm/mach-tegra/pcie.c

+3 −0
Original line number Diff line number Diff line
@@ -43,6 +43,9 @@ 
#include "board.h"

#include "iomap.h"



/* Hack - need to parse this from DT */

#define INT_PCIE_INTR 130



/* register definitions */

#define AFI_OFFSET	0x3800

#define PADS_OFFSET	0x3000