diff options
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod.c')
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 2dca1a896943..1f7dd7dca7bb 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c | |||
@@ -2946,9 +2946,9 @@ static int _omap2xxx_3xxx_wait_target_ready(struct omap_hwmod *oh) | |||
2946 | 2946 | ||
2947 | /* XXX check module SIDLEMODE, hardreset status, enabled clocks */ | 2947 | /* XXX check module SIDLEMODE, hardreset status, enabled clocks */ |
2948 | 2948 | ||
2949 | return omap2xxx_cm_wait_module_ready(oh->prcm.omap2.module_offs, | 2949 | return omap_cm_wait_module_ready(0, oh->prcm.omap2.module_offs, |
2950 | oh->prcm.omap2.idlest_reg_id, | 2950 | oh->prcm.omap2.idlest_reg_id, |
2951 | oh->prcm.omap2.idlest_idle_bit); | 2951 | oh->prcm.omap2.idlest_idle_bit); |
2952 | } | 2952 | } |
2953 | 2953 | ||
2954 | /** | 2954 | /** |
@@ -2973,9 +2973,9 @@ static int _omap4_wait_target_ready(struct omap_hwmod *oh) | |||
2973 | 2973 | ||
2974 | /* XXX check module SIDLEMODE, hardreset status */ | 2974 | /* XXX check module SIDLEMODE, hardreset status */ |
2975 | 2975 | ||
2976 | return omap4_cminst_wait_module_ready(oh->clkdm->prcm_partition, | 2976 | return omap_cm_wait_module_ready(oh->clkdm->prcm_partition, |
2977 | oh->clkdm->cm_inst, | 2977 | oh->clkdm->cm_inst, |
2978 | oh->prcm.omap4.clkctrl_offs); | 2978 | oh->prcm.omap4.clkctrl_offs, 0); |
2979 | } | 2979 | } |
2980 | 2980 | ||
2981 | /** | 2981 | /** |
@@ -3000,8 +3000,8 @@ static int _am33xx_wait_target_ready(struct omap_hwmod *oh) | |||
3000 | 3000 | ||
3001 | /* XXX check module SIDLEMODE, hardreset status */ | 3001 | /* XXX check module SIDLEMODE, hardreset status */ |
3002 | 3002 | ||
3003 | return am33xx_cm_wait_module_ready(oh->clkdm->cm_inst, | 3003 | return omap_cm_wait_module_ready(0, oh->clkdm->cm_inst, |
3004 | oh->prcm.omap4.clkctrl_offs); | 3004 | oh->prcm.omap4.clkctrl_offs, 0); |
3005 | } | 3005 | } |
3006 | 3006 | ||
3007 | /** | 3007 | /** |