diff options
| author | Tony Lindgren <tony@atomide.com> | 2019-03-21 19:00:21 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2019-03-26 19:26:25 +0100 |
| commit | 6d63b12d182ec9924a8236f7cd1db5966c3bcd20 (patch) | |
| tree | 8c8022a6f3a428aad6a23088bc7dc66d68f06c9a | |
| parent | ARM: OMAP2+: Prepare class allocation for dynamically allocated modules (diff) | |
| download | linux-6d63b12d182ec9924a8236f7cd1db5966c3bcd20.tar.xz linux-6d63b12d182ec9924a8236f7cd1db5966c3bcd20.zip | |
ARM: OMAP2+: Define _HWMOD_STATE_DEFAULT and use it
For dynamically allocated struct hwmod entries probing with ti-sysc
interconnect target module driver, we need to specify the initial default
state the same way as we do for the platform data cases.
Let's prepare for that by adding _HWMOD_STATE_DEFAULT that we can then
use to set the initial default state without a need to add similar
CONFIG_PM handling in multiple places.
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap2/io.c | 7 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.h | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index bb8e0bb7ef5d..5e69c8caa1db 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -411,14 +411,9 @@ static int _set_hwmod_postsetup_state(struct omap_hwmod *oh, void *data) static void __init __maybe_unused omap_hwmod_init_postsetup(void) { - u8 postsetup_state; + u8 postsetup_state = _HWMOD_STATE_DEFAULT; /* Set the default postsetup state for all hwmods */ -#ifdef CONFIG_PM - postsetup_state = _HWMOD_STATE_IDLE; -#else - postsetup_state = _HWMOD_STATE_ENABLED; -#endif omap_hwmod_for_each(_set_hwmod_postsetup_state, &postsetup_state); } diff --git a/arch/arm/mach-omap2/omap_hwmod.h b/arch/arm/mach-omap2/omap_hwmod.h index b70cdc21f8a2..51b4332eadf8 100644 --- a/arch/arm/mach-omap2/omap_hwmod.h +++ b/arch/arm/mach-omap2/omap_hwmod.h @@ -493,6 +493,12 @@ struct omap_hwmod_omap4_prcm { #define _HWMOD_STATE_IDLE 5 #define _HWMOD_STATE_DISABLED 6 +#ifdef CONFIG_PM +#define _HWMOD_STATE_DEFAULT _HWMOD_STATE_IDLE +#else +#define _HWMOD_STATE_DEFAULT _HWMOD_STATE_ENABLED +#endif + /** * struct omap_hwmod_class - the type of an IP block * @name: name of the hwmod_class |