Commit 0e5217614e9fad739b0e81a72b84dc8a76ef5326
Exists in
ti-linux-3.14.y
and in
2 other branches
Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-ke…
…rnel/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>
Showing 1 changed file Side-by-side Diff
arch/arm/mach-omap2/omap_hwmod.c
| ... | ... | @@ -2995,9 +2995,6 @@ |
| 2995 | 2995 | if (oh->flags & HWMOD_NO_IDLEST) |
| 2996 | 2996 | return 0; |
| 2997 | 2997 | |
| 2998 | - if (!_find_mpu_rt_port(oh)) | |
| 2999 | - return 0; | |
| 3000 | - | |
| 3001 | 2998 | /* XXX check module SIDLEMODE, hardreset status, enabled clocks */ |
| 3002 | 2999 | |
| 3003 | 3000 | return omap2xxx_cm_wait_module_ready(oh->prcm.omap2.module_offs, |
| ... | ... | @@ -3022,9 +3019,6 @@ |
| 3022 | 3019 | if (oh->flags & HWMOD_NO_IDLEST) |
| 3023 | 3020 | return 0; |
| 3024 | 3021 | |
| 3025 | - if (!_find_mpu_rt_port(oh)) | |
| 3026 | - return 0; | |
| 3027 | - | |
| 3028 | 3022 | /* XXX check module SIDLEMODE, hardreset status, enabled clocks */ |
| 3029 | 3023 | |
| 3030 | 3024 | return omap3xxx_cm_wait_module_ready(oh->prcm.omap2.module_offs, |
| ... | ... | @@ -3049,9 +3043,6 @@ |
| 3049 | 3043 | if (oh->flags & HWMOD_NO_IDLEST || !oh->clkdm) |
| 3050 | 3044 | return 0; |
| 3051 | 3045 | |
| 3052 | - if (!_find_mpu_rt_port(oh)) | |
| 3053 | - return 0; | |
| 3054 | - | |
| 3055 | 3046 | /* XXX check module SIDLEMODE, hardreset status */ |
| 3056 | 3047 | |
| 3057 | 3048 | return omap4_cminst_wait_module_ready(oh->clkdm->prcm_partition, |
| ... | ... | @@ -3075,9 +3066,6 @@ |
| 3075 | 3066 | return -EINVAL; |
| 3076 | 3067 | |
| 3077 | 3068 | if (oh->flags & HWMOD_NO_IDLEST) |
| 3078 | - return 0; | |
| 3079 | - | |
| 3080 | - if (!_find_mpu_rt_port(oh)) | |
| 3081 | 3069 | return 0; |
| 3082 | 3070 | |
| 3083 | 3071 | /* XXX check module SIDLEMODE, hardreset status */ |