diff options
author | Rajendra Nayak <rnayak@ti.com> | 2013-03-31 22:22:22 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2013-03-31 22:22:22 -0400 |
commit | 4280943b6bc81357eb61c3e1111d2d83ec2ef03d (patch) | |
tree | 6fa886d12b01cf60d7373e34ba8ffb1d352da3c6 | |
parent | da91b89eb76d4ecddcfc7fca3b8422891eb5e62e (diff) |
ARM: OMAP2+: hwmod: Remove unused _HWMOD_WAKEUP_ENABLED flag
_HWMOD_WAKEUP_ENABLED is currently unused across the hwmod
framework. Just get rid of it, so we have one less flag to
worry about.
Tested-by: Vaibhav Bedia <vaibhav.bedia@ti.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.h | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index c2c798c08c2b..e5cafed8ef25 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c | |||
@@ -610,8 +610,6 @@ static int _enable_wakeup(struct omap_hwmod *oh, u32 *v) | |||
610 | 610 | ||
611 | /* XXX test pwrdm_get_wken for this hwmod's subsystem */ | 611 | /* XXX test pwrdm_get_wken for this hwmod's subsystem */ |
612 | 612 | ||
613 | oh->_int_flags |= _HWMOD_WAKEUP_ENABLED; | ||
614 | |||
615 | return 0; | 613 | return 0; |
616 | } | 614 | } |
617 | 615 | ||
@@ -645,8 +643,6 @@ static int _disable_wakeup(struct omap_hwmod *oh, u32 *v) | |||
645 | 643 | ||
646 | /* XXX test pwrdm_get_wken for this hwmod's subsystem */ | 644 | /* XXX test pwrdm_get_wken for this hwmod's subsystem */ |
647 | 645 | ||
648 | oh->_int_flags &= ~_HWMOD_WAKEUP_ENABLED; | ||
649 | |||
650 | return 0; | 646 | return 0; |
651 | } | 647 | } |
652 | 648 | ||
diff --git a/arch/arm/mach-omap2/omap_hwmod.h b/arch/arm/mach-omap2/omap_hwmod.h index d43d9b608eda..28f4dea0512e 100644 --- a/arch/arm/mach-omap2/omap_hwmod.h +++ b/arch/arm/mach-omap2/omap_hwmod.h | |||
@@ -477,15 +477,13 @@ struct omap_hwmod_omap4_prcm { | |||
477 | * These are for internal use only and are managed by the omap_hwmod code. | 477 | * These are for internal use only and are managed by the omap_hwmod code. |
478 | * | 478 | * |
479 | * _HWMOD_NO_MPU_PORT: no path exists for the MPU to write to this module | 479 | * _HWMOD_NO_MPU_PORT: no path exists for the MPU to write to this module |
480 | * _HWMOD_WAKEUP_ENABLED: set when the omap_hwmod code has enabled ENAWAKEUP | ||
481 | * _HWMOD_SYSCONFIG_LOADED: set when the OCP_SYSCONFIG value has been cached | 480 | * _HWMOD_SYSCONFIG_LOADED: set when the OCP_SYSCONFIG value has been cached |
482 | * _HWMOD_SKIP_ENABLE: set if hwmod enabled during init (HWMOD_INIT_NO_IDLE) - | 481 | * _HWMOD_SKIP_ENABLE: set if hwmod enabled during init (HWMOD_INIT_NO_IDLE) - |
483 | * causes the first call to _enable() to only update the pinmux | 482 | * causes the first call to _enable() to only update the pinmux |
484 | */ | 483 | */ |
485 | #define _HWMOD_NO_MPU_PORT (1 << 0) | 484 | #define _HWMOD_NO_MPU_PORT (1 << 0) |
486 | #define _HWMOD_WAKEUP_ENABLED (1 << 1) | 485 | #define _HWMOD_SYSCONFIG_LOADED (1 << 1) |
487 | #define _HWMOD_SYSCONFIG_LOADED (1 << 2) | 486 | #define _HWMOD_SKIP_ENABLE (1 << 2) |
488 | #define _HWMOD_SKIP_ENABLE (1 << 3) | ||
489 | 487 | ||
490 | /* | 488 | /* |
491 | * omap_hwmod._state definitions | 489 | * omap_hwmod._state definitions |