diff options
author | Mike Frysinger <vapier@gentoo.org> | 2011-06-26 13:56:23 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2011-07-23 01:18:27 -0400 |
commit | 01f8e34c9855e5aa4f56a73b8d5ea8f7613dbb7e (patch) | |
tree | c02d7f45381f478d6e0181584080a8d6704663e4 /arch/blackfin/include | |
parent | 85c2737ae7c2b64c35862da3757b185e822a259b (diff) |
Blackfin: gpio/ints: generalize pint logic
Have the logic that uses peripheral interrupt blocks key off of pint
defines rather than CPU names so that things are generalized across
families.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/include')
-rw-r--r-- | arch/blackfin/include/asm/gpio.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/blackfin/include/asm/gpio.h b/arch/blackfin/include/asm/gpio.h index 9b8d1867b259..d06162029c69 100644 --- a/arch/blackfin/include/asm/gpio.h +++ b/arch/blackfin/include/asm/gpio.h | |||
@@ -19,6 +19,10 @@ | |||
19 | #define PERIPHERAL_USAGE 1 | 19 | #define PERIPHERAL_USAGE 1 |
20 | #define GPIO_USAGE 0 | 20 | #define GPIO_USAGE 0 |
21 | 21 | ||
22 | #ifndef BFIN_GPIO_PINT | ||
23 | # define BFIN_GPIO_PINT 0 | ||
24 | #endif | ||
25 | |||
22 | #ifndef __ASSEMBLY__ | 26 | #ifndef __ASSEMBLY__ |
23 | 27 | ||
24 | #include <linux/compiler.h> | 28 | #include <linux/compiler.h> |
@@ -40,7 +44,7 @@ | |||
40 | * MODIFICATION HISTORY : | 44 | * MODIFICATION HISTORY : |
41 | **************************************************************/ | 45 | **************************************************************/ |
42 | 46 | ||
43 | #ifndef CONFIG_BF54x | 47 | #if !BFIN_GPIO_PINT |
44 | void set_gpio_dir(unsigned, unsigned short); | 48 | void set_gpio_dir(unsigned, unsigned short); |
45 | void set_gpio_inen(unsigned, unsigned short); | 49 | void set_gpio_inen(unsigned, unsigned short); |
46 | void set_gpio_polar(unsigned, unsigned short); | 50 | void set_gpio_polar(unsigned, unsigned short); |
@@ -133,7 +137,7 @@ static inline void bfin_pm_standby_restore(void) | |||
133 | void bfin_gpio_pm_hibernate_restore(void); | 137 | void bfin_gpio_pm_hibernate_restore(void); |
134 | void bfin_gpio_pm_hibernate_suspend(void); | 138 | void bfin_gpio_pm_hibernate_suspend(void); |
135 | 139 | ||
136 | #ifndef CONFIG_BF54x | 140 | # if !BFIN_GPIO_PINT |
137 | int gpio_pm_wakeup_ctrl(unsigned gpio, unsigned ctrl); | 141 | int gpio_pm_wakeup_ctrl(unsigned gpio, unsigned ctrl); |
138 | 142 | ||
139 | struct gpio_port_s { | 143 | struct gpio_port_s { |
@@ -150,8 +154,9 @@ struct gpio_port_s { | |||
150 | unsigned short reserved; | 154 | unsigned short reserved; |
151 | unsigned short mux; | 155 | unsigned short mux; |
152 | }; | 156 | }; |
153 | #endif /*CONFIG_BF54x*/ | 157 | # endif |
154 | #endif /*CONFIG_PM*/ | 158 | #endif /*CONFIG_PM*/ |
159 | |||
155 | /*********************************************************** | 160 | /*********************************************************** |
156 | * | 161 | * |
157 | * FUNCTIONS: Blackfin GPIO Driver | 162 | * FUNCTIONS: Blackfin GPIO Driver |