aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/include/mach
diff options
context:
space:
mode:
authorCyril Chemparathy <cyril@ti.com>2010-05-01 18:37:54 -0400
committerKevin Hilman <khilman@deeprootsystems.com>2010-05-06 18:02:08 -0400
commit686b634a07451fc4fe3b712fe211bfa861a53241 (patch)
tree109557ee13bc43e3e574fd54fe2354a2da7d6dc9 /arch/arm/mach-davinci/include/mach
parentc12f415a9144a76dc99df34f56ce3022207ad1d0 (diff)
Davinci: gpio - controller type support
This patch allows for gpio controllers that deviate from those found on traditional davinci socs. davinci_soc_info has an added field to indicate the soc-specific gpio controller type. The gpio initialization code then bails out if necessary. More elements (tnetv107x) to be added later into enum davinci_gpio_type. Signed-off-by: Cyril Chemparathy <cyril@ti.com> Tested-by: Sandeep Paulraj <s-paulraj@ti.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-davinci/include/mach')
-rw-r--r--arch/arm/mach-davinci/include/mach/common.h1
-rw-r--r--arch/arm/mach-davinci/include/mach/gpio.h4
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h
index 1d72883f593e..8ffef5bbd9cf 100644
--- a/arch/arm/mach-davinci/include/mach/common.h
+++ b/arch/arm/mach-davinci/include/mach/common.h
@@ -59,6 +59,7 @@ struct davinci_soc_info {
59 u8 *intc_irq_prios; 59 u8 *intc_irq_prios;
60 unsigned long intc_irq_num; 60 unsigned long intc_irq_num;
61 struct davinci_timer_info *timer_info; 61 struct davinci_timer_info *timer_info;
62 int gpio_type;
62 void __iomem *gpio_base; 63 void __iomem *gpio_base;
63 unsigned gpio_num; 64 unsigned gpio_num;
64 unsigned gpio_irq; 65 unsigned gpio_irq;
diff --git a/arch/arm/mach-davinci/include/mach/gpio.h b/arch/arm/mach-davinci/include/mach/gpio.h
index 82591d0d48fb..9a71a26eb77f 100644
--- a/arch/arm/mach-davinci/include/mach/gpio.h
+++ b/arch/arm/mach-davinci/include/mach/gpio.h
@@ -21,6 +21,10 @@
21 21
22#define DAVINCI_GPIO_BASE 0x01C67000 22#define DAVINCI_GPIO_BASE 0x01C67000
23 23
24enum davinci_gpio_type {
25 GPIO_TYPE_DAVINCI = 0,
26};
27
24/* 28/*
25 * basic gpio routines 29 * basic gpio routines
26 * 30 *