diff options
author | Paul Walmsley <paul@pwsan.com> | 2010-12-21 23:05:16 -0500 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2010-12-21 23:05:16 -0500 |
commit | 72e06d087204f3bc9acf281717b90ebf0b9731f7 (patch) | |
tree | 358524d58e5fdb906507ffc9549758c14fce9fbe /arch/arm/plat-omap/gpio.c | |
parent | 1540f214065982e6cbc6b8da1fe65a15e358f7c5 (diff) |
OMAP2+: powerdomain: move header file from plat-omap to mach-omap2
The OMAP powerdomain code and data is all OMAP2+-specific. This seems
unlikely to change any time soon. Move plat-omap/include/plat/powerdomain.h
to mach-omap2/powerdomain.h. The primary point of doing this is to remove
the temptation for unrelated upper-layer code to access powerdomain code
and data directly.
As part of this process, remove the references to powerdomain data
from the GPIO "driver" and the OMAP PM no-op layer, both in plat-omap.
Change the DSPBridge code to point to the new location for the
powerdomain headers. The DSPBridge code should not be including the
powerdomain headers; these should be removed.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Omar Ramirez Luna <omar.ramirez@ti.com>
Cc: Felipe Contreras <felipe.contreras@gmail.com>
Cc: Greg Kroah-Hartman <greg@kroah.com>
Diffstat (limited to 'arch/arm/plat-omap/gpio.c')
-rw-r--r-- | arch/arm/plat-omap/gpio.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index 8d493b992e70..1f98e0b94847 100644 --- a/arch/arm/plat-omap/gpio.c +++ b/arch/arm/plat-omap/gpio.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <mach/irqs.h> | 29 | #include <mach/irqs.h> |
30 | #include <mach/gpio.h> | 30 | #include <mach/gpio.h> |
31 | #include <asm/mach/irq.h> | 31 | #include <asm/mach/irq.h> |
32 | #include <plat/powerdomain.h> | ||
33 | 32 | ||
34 | /* | 33 | /* |
35 | * OMAP1510 GPIO registers | 34 | * OMAP1510 GPIO registers |
@@ -1864,7 +1863,7 @@ static struct sys_device omap_gpio_device = { | |||
1864 | 1863 | ||
1865 | static int workaround_enabled; | 1864 | static int workaround_enabled; |
1866 | 1865 | ||
1867 | void omap2_gpio_prepare_for_idle(int power_state) | 1866 | void omap2_gpio_prepare_for_idle(int off_mode) |
1868 | { | 1867 | { |
1869 | int i, c = 0; | 1868 | int i, c = 0; |
1870 | int min = 0; | 1869 | int min = 0; |
@@ -1880,7 +1879,7 @@ void omap2_gpio_prepare_for_idle(int power_state) | |||
1880 | for (j = 0; j < hweight_long(bank->dbck_enable_mask); j++) | 1879 | for (j = 0; j < hweight_long(bank->dbck_enable_mask); j++) |
1881 | clk_disable(bank->dbck); | 1880 | clk_disable(bank->dbck); |
1882 | 1881 | ||
1883 | if (power_state > PWRDM_POWER_OFF) | 1882 | if (!off_mode) |
1884 | continue; | 1883 | continue; |
1885 | 1884 | ||
1886 | /* If going to OFF, remove triggering for all | 1885 | /* If going to OFF, remove triggering for all |