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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 16 Jan 2015 14:59:33 +0000 (06:59 -0800)
commitdab35042ecb771edefc13e1620470919128d7900
treeb47d65696ae02dcf89bf3e7b65e2102863a2f2d1
parent8be474538333eba411aae430bedc7b7e4e4f882e
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm/mach-omap2/pm44xx.c