diff options
| author | Colin Cross <ccross@android.com> | 2011-06-14 11:46:56 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-14 11:46:56 -0700 |
| commit | ad1f9adb36d07438bd38270744f190b49d094ad8 (patch) | |
| tree | bf155f7af98e1702abc1b7aa3c87226323606367 /drivers/gpio | |
| parent | 4a968e99063abdd6cf118d85bab68e8f0d8b717c (diff) | |
| parent | b26b13a08ed71b2db6152774e4adb5c93e0636e5 (diff) | |
| download | kernel_samsung_tuna-ad1f9adb36d07438bd38270744f190b49d094ad8.zip kernel_samsung_tuna-ad1f9adb36d07438bd38270744f190b49d094ad8.tar.gz kernel_samsung_tuna-ad1f9adb36d07438bd38270744f190b49d094ad8.tar.bz2 | |
Merge branch 'linux-omap-pm-3.0' into linux-omap-3.0
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpio-omap.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index 01f74a8..13ca564 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -73,6 +73,8 @@ struct omap3_gpio_regs { static struct omap3_gpio_regs gpio_context[OMAP34XX_NR_GPIOS]; #endif +#include <plat/omap_device.h> + /* * TODO: Cleanup gpio_bank usage as it is having information * related to all instances of the device @@ -1748,6 +1750,7 @@ void omap2_gpio_prepare_for_idle(int off_mode) { int i, c = 0; int min = 0; + struct platform_device *pdev; if (cpu_is_omap34xx()) min = 1; @@ -1760,6 +1763,9 @@ void omap2_gpio_prepare_for_idle(int off_mode) for (j = 0; j < hweight_long(bank->dbck_enable_mask); j++) clk_disable(bank->dbck); + pdev = to_platform_device(bank->dev); + omap_device_idle(pdev); + if (!off_mode) continue; @@ -1817,6 +1823,7 @@ void omap2_gpio_resume_after_idle(void) { int i; int min = 0; + struct platform_device *pdev; if (cpu_is_omap34xx()) min = 1; @@ -1825,6 +1832,9 @@ void omap2_gpio_resume_after_idle(void) u32 l = 0, gen, gen0, gen1; int j; + pdev = to_platform_device(bank->dev); + omap_device_enable(pdev); + for (j = 0; j < hweight_long(bank->dbck_enable_mask); j++) clk_enable(bank->dbck); |