diff options
| author | Kevin Hilman <khilman@ti.com> | 2011-06-14 05:53:18 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-06-14 05:53:18 -0700 |
| commit | e9e35c5a2b2c803b5e2f25906d8ffe110670ceb6 (patch) | |
| tree | 0e119edbf03705b11b9af3c2c558ba98aefe6eda /arch/arm/mach-omap1/pm_bus.c | |
| parent | 2c53b436a30867eb6b47dd7bab23ba638d1fb0d2 (diff) | |
| download | talos-obmc-linux-e9e35c5a2b2c803b5e2f25906d8ffe110670ceb6.tar.gz talos-obmc-linux-e9e35c5a2b2c803b5e2f25906d8ffe110670ceb6.zip | |
OMAP1: PM: register notifiers with generic clock ops even when !PM_RUNTIME
When runtime PM is disabled, device clocks need to be enabled on
device add and disabled on device remove. This currently is not
happening because in the !PM_RUNTIME case, no notifiers are registered
for OMAP1 devices.
Fix this by ensuring notifiers are registered, even in the !PM_RUNTIME case.
Reported-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Tested-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/pm_bus.c')
| -rw-r--r-- | arch/arm/mach-omap1/pm_bus.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/pm_bus.c b/arch/arm/mach-omap1/pm_bus.c index fe31d933f0ed..334fb8871bc3 100644 --- a/arch/arm/mach-omap1/pm_bus.c +++ b/arch/arm/mach-omap1/pm_bus.c @@ -56,9 +56,13 @@ static struct dev_power_domain default_power_domain = { USE_PLATFORM_PM_SLEEP_OPS }, }; +#define OMAP1_PWR_DOMAIN (&default_power_domain) +#else +#define OMAP1_PWR_DOMAIN NULL +#endif /* CONFIG_PM_RUNTIME */ static struct pm_clk_notifier_block platform_bus_notifier = { - .pwr_domain = &default_power_domain, + .pwr_domain = OMAP1_PWR_DOMAIN, .con_ids = { "ick", "fck", NULL, }, }; @@ -72,4 +76,4 @@ static int __init omap1_pm_runtime_init(void) return 0; } core_initcall(omap1_pm_runtime_init); -#endif /* CONFIG_PM_RUNTIME */ + |
