Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9e35c5a authored by Kevin Hilman's avatar Kevin Hilman Committed by Tony Lindgren
Browse files

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: default avatarJanusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Tested-by: default avatarJanusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 2c53b436

arch/arm/mach-omap1/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -4,14 +4,14 @@ 


# Common support

obj-y := io.o id.o sram.o time.o irq.o mux.o flash.o serial.o devices.o dma.o

obj-y += clock.o clock_data.o opp_data.o reset.o

obj-y += clock.o clock_data.o opp_data.o reset.o pm_bus.o



obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o



obj-$(CONFIG_OMAP_32K_TIMER)	+= timer32k.o



# Power Management

obj-$(CONFIG_PM) += pm.o sleep.o pm_bus.o

obj-$(CONFIG_PM) += pm.o sleep.o



# DSP

obj-$(CONFIG_OMAP_MBOX_FWK)	+= mailbox_mach.o

arch/arm/mach-omap1/pm_bus.c

+6 −2
Original line number Diff line number Diff line
@@ -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 */