diff options
author | Michael Hennerich <michael.hennerich@analog.com> | 2010-03-10 09:26:06 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2010-05-21 09:40:16 -0400 |
commit | bb84dbf69b0730fcc78c275f900ed74b2b8453a5 (patch) | |
tree | c6389f2a68b1f511f685ef5069a4704614ed11c2 /arch/blackfin/include | |
parent | 85eb0e4b15efc8034cbae193c99536dae7896701 (diff) |
Blackfin: punt Blackfin-specific GPIO wakeup API
This patch removes a custom GPIO wakeup API which allowed GPIOs to act
as wakeup sources, which are not configured as Interrupts.
This API is a leftover from the time before irq_wake was established.
From now on people must use enable_irq_wake(GPIO_IRQx) and the GPIO in
question needs to be configured as Interrupt.
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/include')
-rw-r--r-- | arch/blackfin/include/asm/gpio.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/blackfin/include/asm/gpio.h b/arch/blackfin/include/asm/gpio.h index 91bd2d7b9d55..01b19d0cf509 100644 --- a/arch/blackfin/include/asm/gpio.h +++ b/arch/blackfin/include/asm/gpio.h | |||
@@ -167,23 +167,23 @@ int bfin_special_gpio_request(unsigned gpio, const char *label); | |||
167 | #endif | 167 | #endif |
168 | 168 | ||
169 | #ifdef CONFIG_PM | 169 | #ifdef CONFIG_PM |
170 | int bfin_pm_standby_ctrl(unsigned ctrl); | ||
170 | 171 | ||
171 | unsigned int bfin_pm_standby_setup(void); | 172 | static inline int bfin_pm_standby_setup(void) |
172 | void bfin_pm_standby_restore(void); | 173 | { |
174 | return bfin_pm_standby_ctrl(1); | ||
175 | } | ||
176 | |||
177 | static inline void bfin_pm_standby_restore(void) | ||
178 | { | ||
179 | bfin_pm_standby_ctrl(0); | ||
180 | } | ||
173 | 181 | ||
174 | void bfin_gpio_pm_hibernate_restore(void); | 182 | void bfin_gpio_pm_hibernate_restore(void); |
175 | void bfin_gpio_pm_hibernate_suspend(void); | 183 | void bfin_gpio_pm_hibernate_suspend(void); |
176 | 184 | ||
177 | #ifndef CONFIG_BF54x | 185 | #ifndef CONFIG_BF54x |
178 | #define PM_WAKE_RISING 0x1 | 186 | int gpio_pm_wakeup_ctrl(unsigned gpio, unsigned ctrl); |
179 | #define PM_WAKE_FALLING 0x2 | ||
180 | #define PM_WAKE_HIGH 0x4 | ||
181 | #define PM_WAKE_LOW 0x8 | ||
182 | #define PM_WAKE_BOTH_EDGES (PM_WAKE_RISING | PM_WAKE_FALLING) | ||
183 | #define PM_WAKE_IGNORE 0xF0 | ||
184 | |||
185 | int gpio_pm_wakeup_request(unsigned gpio, unsigned char type); | ||
186 | void gpio_pm_wakeup_free(unsigned gpio); | ||
187 | 187 | ||
188 | struct gpio_port_s { | 188 | struct gpio_port_s { |
189 | unsigned short data; | 189 | unsigned short data; |