diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-14 22:27:03 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-14 22:27:03 +0000 |
| commit | 4c4070a3097fe9ef57af9ebca6f57a2c57bc6ff1 (patch) | |
| tree | feadc23782213994dfa81806e7a056208148809e /arch/arm/plat-nomadik/include | |
| parent | 5821c95ffbfd368194927a4f7803125c5af8857c (diff) | |
| parent | b9df468d8630c583e3597e24ad8cc4c0318790c1 (diff) | |
| download | blackbird-op-linux-4c4070a3097fe9ef57af9ebca6f57a2c57bc6ff1.tar.gz blackbird-op-linux-4c4070a3097fe9ef57af9ebca6f57a2c57bc6ff1.zip | |
Merge branch 'for-rmk-devel-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into devel-stable
Diffstat (limited to 'arch/arm/plat-nomadik/include')
| -rw-r--r-- | arch/arm/plat-nomadik/include/plat/gpio.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/plat-nomadik/include/plat/gpio.h b/arch/arm/plat-nomadik/include/plat/gpio.h index 67b113d639d8..1b9f6f0843d1 100644 --- a/arch/arm/plat-nomadik/include/plat/gpio.h +++ b/arch/arm/plat-nomadik/include/plat/gpio.h @@ -75,6 +75,9 @@ extern int nmk_gpio_set_pull(int gpio, enum nmk_gpio_pull pull); extern int nmk_gpio_set_mode(int gpio, int gpio_mode); extern int nmk_gpio_get_mode(int gpio); +extern void nmk_gpio_wakeups_suspend(void); +extern void nmk_gpio_wakeups_resume(void); + /* * Platform data to register a block: only the initial gpio/irq number. */ @@ -82,6 +85,9 @@ struct nmk_gpio_platform_data { char *name; int first_gpio; int first_irq; + int num_gpio; + u32 (*get_secondary_status)(unsigned int bank); + void (*set_ioforce)(bool enable); }; #endif /* __ASM_PLAT_GPIO_H */ |
