]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
ARM: OMAP4: PM: Only do static dependency configuration in omap4_init_static_deps
authorNishanth Menon <nm@ti.com>
Tue, 21 Oct 2014 20:22:28 +0000 (15:22 -0500)
committerJiri Slaby <jslaby@suse.cz>
Mon, 26 Jan 2015 13:39:05 +0000 (14:39 +0100)
commit02d684c2515b8bbe11b9ce1345840d5c855dc685
treec68cff5a4008743bbeeac5f758d4fa10f9ba60bd
parent3e0c111cf99888ffedbe3ee9ff4818127f4d8a4e
ARM: OMAP4: PM: Only do static dependency configuration in omap4_init_static_deps

commit 9008d83fe9dc2e0f19b8ba17a423b3759d8e0fd7 upstream.

Commit 705814b5ea6f ("ARM: OMAP4+: PM: Consolidate OMAP4 PM code to
re-use it for OMAP5")

Moved logic generic for OMAP5+ as part of the init routine by
introducing omap4_pm_init. However, the patch left the powerdomain
initial setup, an unused omap4430 es1.0 check and a spurious log
"Power Management for TI OMAP4." in the original code.

Remove the duplicate code which is already present in omap4_pm_init from
omap4_init_static_deps.

As part of this change, also move the u-boot version print out of the
static dependency function to the omap4_pm_init function.

Fixes: 705814b5ea6f ("ARM: OMAP4+: PM: Consolidate OMAP4 PM code to re-use it for OMAP5")
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
arch/arm/mach-omap2/pm44xx.c