diff options
author | Kevin Hilman <khilman@ti.com> | 2011-05-26 17:48:19 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@ti.com> | 2011-06-20 17:12:32 -0400 |
commit | 3a7b7bdd24286a9cfce9dda5d2b7324dfc2e3b31 (patch) | |
tree | a03c6323d8e940cb0ebb61ca6368c46c268b4e96 /arch | |
parent | 442155adc0989148e800923f4b4b191ce2120c6a (diff) |
OMAP3: PM debug: remove sleep_while_idle feature
Remove the OMAP-specific PM debug 'sleep_while_idle' feature which is
currently available as an OMAP-specific debugfs entry.
This duplicates existing ARM-generic functionality available as a
boot-time option using the boot cmdline option 'hohlt'.
If runtime configuration of this is needed, then adding a debugfs
entry for the ARM-generic hlt/nohlt interface should be added.
Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Jean Pihet <j-pihet@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/pm-debug.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-omap2/pm.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 2 |
3 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c index e01da45c0537..d9f08210be31 100644 --- a/arch/arm/mach-omap2/pm-debug.c +++ b/arch/arm/mach-omap2/pm-debug.c | |||
@@ -40,7 +40,6 @@ | |||
40 | 40 | ||
41 | int omap2_pm_debug; | 41 | int omap2_pm_debug; |
42 | u32 enable_off_mode; | 42 | u32 enable_off_mode; |
43 | u32 sleep_while_idle; | ||
44 | u32 wakeup_timer_seconds; | 43 | u32 wakeup_timer_seconds; |
45 | u32 wakeup_timer_milliseconds; | 44 | u32 wakeup_timer_milliseconds; |
46 | 45 | ||
@@ -639,8 +638,6 @@ static int pm_dbg_init(void) | |||
639 | 638 | ||
640 | (void) debugfs_create_file("enable_off_mode", S_IRUGO | S_IWUSR, d, | 639 | (void) debugfs_create_file("enable_off_mode", S_IRUGO | S_IWUSR, d, |
641 | &enable_off_mode, &pm_dbg_option_fops); | 640 | &enable_off_mode, &pm_dbg_option_fops); |
642 | (void) debugfs_create_file("sleep_while_idle", S_IRUGO | S_IWUSR, d, | ||
643 | &sleep_while_idle, &pm_dbg_option_fops); | ||
644 | (void) debugfs_create_file("wakeup_timer_seconds", S_IRUGO | S_IWUSR, d, | 641 | (void) debugfs_create_file("wakeup_timer_seconds", S_IRUGO | S_IWUSR, d, |
645 | &wakeup_timer_seconds, &pm_dbg_option_fops); | 642 | &wakeup_timer_seconds, &pm_dbg_option_fops); |
646 | (void) debugfs_create_file("wakeup_timer_milliseconds", | 643 | (void) debugfs_create_file("wakeup_timer_milliseconds", |
diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h index 45bcfce77352..674eedcee92c 100644 --- a/arch/arm/mach-omap2/pm.h +++ b/arch/arm/mach-omap2/pm.h | |||
@@ -69,13 +69,11 @@ extern void omap2_pm_dump(int mode, int resume, unsigned int us); | |||
69 | extern void omap2_pm_wakeup_on_timer(u32 seconds, u32 milliseconds); | 69 | extern void omap2_pm_wakeup_on_timer(u32 seconds, u32 milliseconds); |
70 | extern int omap2_pm_debug; | 70 | extern int omap2_pm_debug; |
71 | extern u32 enable_off_mode; | 71 | extern u32 enable_off_mode; |
72 | extern u32 sleep_while_idle; | ||
73 | #else | 72 | #else |
74 | #define omap2_pm_dump(mode, resume, us) do {} while (0); | 73 | #define omap2_pm_dump(mode, resume, us) do {} while (0); |
75 | #define omap2_pm_wakeup_on_timer(seconds, milliseconds) do {} while (0); | 74 | #define omap2_pm_wakeup_on_timer(seconds, milliseconds) do {} while (0); |
76 | #define omap2_pm_debug 0 | 75 | #define omap2_pm_debug 0 |
77 | #define enable_off_mode 0 | 76 | #define enable_off_mode 0 |
78 | #define sleep_while_idle 0 | ||
79 | #endif | 77 | #endif |
80 | 78 | ||
81 | #if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS) | 79 | #if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS) |
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index c155c9d1c82c..cb342447544c 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c | |||
@@ -497,8 +497,6 @@ console_still_active: | |||
497 | 497 | ||
498 | int omap3_can_sleep(void) | 498 | int omap3_can_sleep(void) |
499 | { | 499 | { |
500 | if (!sleep_while_idle) | ||
501 | return 0; | ||
502 | if (!omap_uart_can_sleep()) | 500 | if (!omap_uart_can_sleep()) |
503 | return 0; | 501 | return 0; |
504 | return 1; | 502 | return 1; |