lkml.org 
[lkml]   [2015]   [Jan]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.18 121/150] ARM: OMAP4: PM: Only do static dependency configuration in omap4_init_static_deps
    Date
    3.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Nishanth Menon <nm@ti.com>

    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 | 29 +++++++++--------------------
    1 file changed, 9 insertions(+), 20 deletions(-)

    --- a/arch/arm/mach-omap2/pm44xx.c
    +++ b/arch/arm/mach-omap2/pm44xx.c
    @@ -160,26 +160,6 @@ static inline int omap4_init_static_deps
    struct clockdomain *ducati_clkdm, *l3_2_clkdm;
    int ret = 0;

    - if (omap_rev() == OMAP4430_REV_ES1_0) {
    - WARN(1, "Power Management not supported on OMAP4430 ES1.0\n");
    - return -ENODEV;
    - }
    -
    - pr_err("Power Management for TI OMAP4.\n");
    - /*
    - * OMAP4 chip PM currently works only with certain (newer)
    - * versions of bootloaders. This is due to missing code in the
    - * kernel to properly reset and initialize some devices.
    - * http://www.spinics.net/lists/arm-kernel/msg218641.html
    - */
    - pr_warn("OMAP4 PM: u-boot >= v2012.07 is required for full PM support\n");
    -
    - ret = pwrdm_for_each(pwrdms_setup, NULL);
    - if (ret) {
    - pr_err("Failed to setup powerdomains\n");
    - return ret;
    - }
    -
    /*
    * The dynamic dependency between MPUSS -> MEMIF and
    * MPUSS -> L4_PER/L3_* and DUCATI -> L3_* doesn't work as
    @@ -272,6 +252,15 @@ int __init omap4_pm_init(void)

    pr_info("Power Management for TI OMAP4+ devices.\n");

    + /*
    + * OMAP4 chip PM currently works only with certain (newer)
    + * versions of bootloaders. This is due to missing code in the
    + * kernel to properly reset and initialize some devices.
    + * http://www.spinics.net/lists/arm-kernel/msg218641.html
    + */
    + if (cpu_is_omap44xx())
    + pr_warn("OMAP4 PM: u-boot >= v2012.07 is required for full PM support\n");
    +
    ret = pwrdm_for_each(pwrdms_setup, NULL);
    if (ret) {
    pr_err("Failed to setup powerdomains.\n");



    \
     
     \ /
      Last update: 2015-01-14 08:41    [W:4.115 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site