Commit 476e5be7 authored by Jean Pihet's avatar Jean Pihet Committed by Paul Walmsley

OMAP PM: remove OMAP_PM_NONE config option

The current code base is not linking with the OMAP_PM_NONE
option set.
Since the option OMAP_PM_NOOP provides a no-op/debug layer,
OMAP_PM_NONE can be removed.
OMAP_PM_NOOP is enabled by default by Kconfig.
Signed-off-by: default avatarJean Pihet <j-pihet@ti.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 3c95b707
...@@ -211,9 +211,6 @@ choice ...@@ -211,9 +211,6 @@ choice
depends on ARCH_OMAP depends on ARCH_OMAP
default OMAP_PM_NOOP default OMAP_PM_NOOP
config OMAP_PM_NONE
bool "No PM layer"
config OMAP_PM_NOOP config OMAP_PM_NOOP
bool "No-op/debug PM layer" bool "No-op/debug PM layer"
......
...@@ -40,11 +40,7 @@ ...@@ -40,11 +40,7 @@
* framework starts. The "_if_" is to avoid name collisions with the * framework starts. The "_if_" is to avoid name collisions with the
* PM idle-loop code. * PM idle-loop code.
*/ */
#ifdef CONFIG_OMAP_PM_NONE
#define omap_pm_if_early_init() 0
#else
int __init omap_pm_if_early_init(void); int __init omap_pm_if_early_init(void);
#endif
/** /**
* omap_pm_if_init - OMAP PM init code called after clock fw init * omap_pm_if_init - OMAP PM init code called after clock fw init
...@@ -52,11 +48,7 @@ int __init omap_pm_if_early_init(void); ...@@ -52,11 +48,7 @@ int __init omap_pm_if_early_init(void);
* The main initialization code. OPP tables are passed in here. The * The main initialization code. OPP tables are passed in here. The
* "_if_" is to avoid name collisions with the PM idle-loop code. * "_if_" is to avoid name collisions with the PM idle-loop code.
*/ */
#ifdef CONFIG_OMAP_PM_NONE
#define omap_pm_if_init() 0
#else
int __init omap_pm_if_init(void); int __init omap_pm_if_init(void);
#endif
/** /**
* omap_pm_if_exit - OMAP PM exit code * omap_pm_if_exit - OMAP PM exit code
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment