aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/include/mach
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-davinci/include/mach')
-rw-r--r--arch/arm/mach-davinci/include/mach/gpio.h2
-rw-r--r--arch/arm/mach-davinci/include/mach/irqs.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/include/mach/gpio.h b/arch/arm/mach-davinci/include/mach/gpio.h
index ebcc29babeae..4f032b38cd6e 100644
--- a/arch/arm/mach-davinci/include/mach/gpio.h
+++ b/arch/arm/mach-davinci/include/mach/gpio.h
@@ -78,6 +78,8 @@ __gpio_to_controller(unsigned gpio)
78 ptr = base + 0x60; 78 ptr = base + 0x60;
79 else if (gpio < 32 * 4) 79 else if (gpio < 32 * 4)
80 ptr = base + 0x88; 80 ptr = base + 0x88;
81 else if (gpio < 32 * 5)
82 ptr = base + 0xb0;
81 else 83 else
82 ptr = NULL; 84 ptr = NULL;
83 return ptr; 85 return ptr;
diff --git a/arch/arm/mach-davinci/include/mach/irqs.h b/arch/arm/mach-davinci/include/mach/irqs.h
index 6047c2d9da33..7f755cc387e5 100644
--- a/arch/arm/mach-davinci/include/mach/irqs.h
+++ b/arch/arm/mach-davinci/include/mach/irqs.h
@@ -397,8 +397,8 @@
397 397
398#define DA850_N_CP_INTC_IRQ 101 398#define DA850_N_CP_INTC_IRQ 101
399 399
400/* da830/da850 currently has the most gpio pins (128) */ 400/* da850 currently has the most gpio pins (144) */
401#define DAVINCI_N_GPIO 128 401#define DAVINCI_N_GPIO 144
402/* da850 currently has the most irqs so use DA850_N_CP_INTC_IRQ */ 402/* da850 currently has the most irqs so use DA850_N_CP_INTC_IRQ */
403#define NR_IRQS (DA850_N_CP_INTC_IRQ + DAVINCI_N_GPIO) 403#define NR_IRQS (DA850_N_CP_INTC_IRQ + DAVINCI_N_GPIO)
404 404