Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree into ti-linux-3.14.y

TI-Feature: platform_base
TI-Tree: git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree.git
TI-Branch: platform-ti-linux-3.14.y

* 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
  ARM: OMAP2+: hwmod: Fix _wait_target_ready() for hwmods without sysc

Signed-off-by: Texas Instruments Auto Merger <lcpd_integration@list.ti.com>

1 files changed, 0 insertions, 12 deletions

diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 4c6b7b27356..f22b4dea0aa 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -2995,9 +2995,6 @@ static int _omap2xxx_wait_target_ready(struct omap_hwmod *oh)
         if (oh->flags & HWMOD_NO_IDLEST)
                 return 0;
 
-        if (!_find_mpu_rt_port(oh))
-                return 0;
-
         /* XXX check module SIDLEMODE, hardreset status, enabled clocks */
 
         return omap2xxx_cm_wait_module_ready(oh->prcm.omap2.module_offs,
@@ -3022,9 +3019,6 @@ static int _omap3xxx_wait_target_ready(struct omap_hwmod *oh)
         if (oh->flags & HWMOD_NO_IDLEST)
                 return 0;
 
-        if (!_find_mpu_rt_port(oh))
-                return 0;
-
         /* XXX check module SIDLEMODE, hardreset status, enabled clocks */
 
         return omap3xxx_cm_wait_module_ready(oh->prcm.omap2.module_offs,
@@ -3049,9 +3043,6 @@ static int _omap4_wait_target_ready(struct omap_hwmod *oh)
         if (oh->flags & HWMOD_NO_IDLEST || !oh->clkdm)
                 return 0;
 
-        if (!_find_mpu_rt_port(oh))
-                return 0;
-
         /* XXX check module SIDLEMODE, hardreset status */
 
         return omap4_cminst_wait_module_ready(oh->clkdm->prcm_partition,
@@ -3077,9 +3068,6 @@ static int _am33xx_wait_target_ready(struct omap_hwmod *oh)
         if (oh->flags & HWMOD_NO_IDLEST)
                 return 0;
 
-        if (!_find_mpu_rt_port(oh))
-                return 0;
-
         /* XXX check module SIDLEMODE, hardreset status */
 
         return am33xx_cm_wait_module_ready(oh->clkdm->cm_inst,