diff options
| author | Stephen Warren <swarren@wwwdotorg.org> | 2012-03-26 09:49:22 -0600 |
|---|---|---|
| committer | Stephen Warren <swarren@wwwdotorg.org> | 2012-03-26 09:49:22 -0600 |
| commit | 1ad105fc77e61f9dd7a272659a248e2979fdb893 (patch) | |
| tree | b8f0c64314e05c9208501d9aba89cc5abb57234e /arch/arm/mach-tegra/include/mach/irqs.h | |
| parent | 2bc856c419d9941589ff210900a60906d773f1c4 (diff) | |
| parent | e186ad74c0941f5caeda28bde76dab903b342c1c (diff) | |
Merge remote branch 'remotes/korg_olof_tegra/for-3.4/soc' into for-3.4/fixes-for-io-cleanup
Diffstat (limited to 'arch/arm/mach-tegra/include/mach/irqs.h')
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/irqs.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/include/mach/irqs.h b/arch/arm/mach-tegra/include/mach/irqs.h index a2146cd6867..aad1a2c1d71 100644 --- a/arch/arm/mach-tegra/include/mach/irqs.h +++ b/arch/arm/mach-tegra/include/mach/irqs.h @@ -165,11 +165,12 @@ #define INT_QUAD_RES_30 (INT_QUAD_BASE + 30) #define INT_QUAD_RES_31 (INT_QUAD_BASE + 31) -#define INT_MAIN_NR (INT_QUAD_BASE + 32 - INT_PRI_BASE) - +/* Tegra30 has 5 banks of 32 IRQs */ +#define INT_MAIN_NR (32 * 5) #define INT_GPIO_BASE (INT_PRI_BASE + INT_MAIN_NR) -#define INT_GPIO_NR (28 * 8) +/* Tegra30 has 8 banks of 32 GPIOs */ +#define INT_GPIO_NR (32 * 8) #define TEGRA_NR_IRQS (INT_GPIO_BASE + INT_GPIO_NR) |