Commit 95a76bd5fa8db0494a1c15868fe0ebdf0be8432a
Committed by
Greg Kroah-Hartman
Greg Kroah-Hartman
1 parent
b8775da83d
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>
Showing 1 changed file with 9 additions and 20 deletions Side-by-side Diff
arch/arm/mach-omap2/pm44xx.c
| ... | ... | @@ -160,27 +160,7 @@ |
| 160 | 160 | struct clockdomain *ducati_clkdm, *l3_2_clkdm; |
| 161 | 161 | int ret = 0; |
| 162 | 162 | |
| 163 | - if (omap_rev() == OMAP4430_REV_ES1_0) { | |
| 164 | - WARN(1, "Power Management not supported on OMAP4430 ES1.0\n"); | |
| 165 | - return -ENODEV; | |
| 166 | - } | |
| 167 | - | |
| 168 | - pr_err("Power Management for TI OMAP4.\n"); | |
| 169 | 163 | /* |
| 170 | - * OMAP4 chip PM currently works only with certain (newer) | |
| 171 | - * versions of bootloaders. This is due to missing code in the | |
| 172 | - * kernel to properly reset and initialize some devices. | |
| 173 | - * http://www.spinics.net/lists/arm-kernel/msg218641.html | |
| 174 | - */ | |
| 175 | - pr_warn("OMAP4 PM: u-boot >= v2012.07 is required for full PM support\n"); | |
| 176 | - | |
| 177 | - ret = pwrdm_for_each(pwrdms_setup, NULL); | |
| 178 | - if (ret) { | |
| 179 | - pr_err("Failed to setup powerdomains\n"); | |
| 180 | - return ret; | |
| 181 | - } | |
| 182 | - | |
| 183 | - /* | |
| 184 | 164 | * The dynamic dependency between MPUSS -> MEMIF and |
| 185 | 165 | * MPUSS -> L4_PER/L3_* and DUCATI -> L3_* doesn't work as |
| 186 | 166 | * expected. The hardware recommendation is to enable static |
| ... | ... | @@ -271,6 +251,15 @@ |
| 271 | 251 | } |
| 272 | 252 | |
| 273 | 253 | pr_info("Power Management for TI OMAP4+ devices.\n"); |
| 254 | + | |
| 255 | + /* | |
| 256 | + * OMAP4 chip PM currently works only with certain (newer) | |
| 257 | + * versions of bootloaders. This is due to missing code in the | |
| 258 | + * kernel to properly reset and initialize some devices. | |
| 259 | + * http://www.spinics.net/lists/arm-kernel/msg218641.html | |
| 260 | + */ | |
| 261 | + if (cpu_is_omap44xx()) | |
| 262 | + pr_warn("OMAP4 PM: u-boot >= v2012.07 is required for full PM support\n"); | |
| 274 | 263 | |
| 275 | 264 | ret = pwrdm_for_each(pwrdms_setup, NULL); |
| 276 | 265 | if (ret) { |