• Paul Walmsley's avatar
    ARM: OMAP4: PM: fix PM regression introduced by recent clock cleanup · 92702df3
    Paul Walmsley authored
    Commit 17b7e7d3 ("ARM: OMAP4:
    clock/hwmod data: start to remove some IP block control "clocks"")
    introduced a regression preventing the L3INIT clockdomain of OMAP4
    systems from entering idle.  This in turn prevented these systems from
    entering full chip clock-stop.
    
    The regression was caused by the incorrect removal of a so-called
    "optional functional clock" from the OMAP4 clock data.  This wasn't
    caught for two reasons.  First, I missed the retention entry failure
    in the branch test logs:
    
    http://www.pwsan.com/omap/testlogs/cleanup_a_3.9/20130126014242/pm/4460pandaes/4460pandaes_log.txt
    
    Second, the integration data for the OCP2SCP PHY IP block, added by
    commit 0c668875 ("ARM: OMAP4: hwmod
    data: add remaining USB-related IP blocks"), should have associated this
    clock with the IP block, but did not.
    
    Fix by adding back the so-called "optional" functional clock to the
    clock data, and by linking that clock to the OCP2SCP PHY IP block
    integration hwmod data.
    
    The problem patch was discovered by J, Keerthy <j-keerthy@ti.com>.
    
    Cc: Keerthy <j-keerthy@ti.com>
    Cc: Benoît Cousson <b-cousson@ti.com>
    Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
    92702df3
omap_hwmod_44xx_data.c 162 KB