diff options
Diffstat (limited to 'arch/arm/mach-omap2/cm_common.c')
-rw-r--r-- | arch/arm/mach-omap2/cm_common.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/cm_common.c b/arch/arm/mach-omap2/cm_common.c index 8f6c4710877e..dd191837ac13 100644 --- a/arch/arm/mach-omap2/cm_common.c +++ b/arch/arm/mach-omap2/cm_common.c | |||
@@ -72,9 +72,10 @@ int cm_split_idlest_reg(void __iomem *idlest_reg, s16 *prcm_inst, | |||
72 | } | 72 | } |
73 | 73 | ||
74 | /** | 74 | /** |
75 | * cm_wait_module_ready - wait for a module to leave idle or standby | 75 | * omap_cm_wait_module_ready - wait for a module to leave idle or standby |
76 | * @part: PRCM partition | ||
76 | * @prcm_mod: PRCM module offset | 77 | * @prcm_mod: PRCM module offset |
77 | * @idlest_id: CM_IDLESTx register ID (i.e., x = 1, 2, 3) | 78 | * @idlest_reg: CM_IDLESTx register |
78 | * @idlest_shift: shift of the bit in the CM_IDLEST* register to check | 79 | * @idlest_shift: shift of the bit in the CM_IDLEST* register to check |
79 | * | 80 | * |
80 | * Wait for the PRCM to indicate that the module identified by | 81 | * Wait for the PRCM to indicate that the module identified by |
@@ -83,7 +84,8 @@ int cm_split_idlest_reg(void __iomem *idlest_reg, s16 *prcm_inst, | |||
83 | * no per-SoC wait_module_ready() function pointer has been registered | 84 | * no per-SoC wait_module_ready() function pointer has been registered |
84 | * or if the idlest register is unknown on the SoC. | 85 | * or if the idlest register is unknown on the SoC. |
85 | */ | 86 | */ |
86 | int cm_wait_module_ready(s16 prcm_mod, u8 idlest_id, u8 idlest_shift) | 87 | int omap_cm_wait_module_ready(u8 part, s16 prcm_mod, u16 idlest_reg, |
88 | u8 idlest_shift) | ||
87 | { | 89 | { |
88 | if (!cm_ll_data->wait_module_ready) { | 90 | if (!cm_ll_data->wait_module_ready) { |
89 | WARN_ONCE(1, "cm: %s: no low-level function defined\n", | 91 | WARN_ONCE(1, "cm: %s: no low-level function defined\n", |
@@ -91,7 +93,8 @@ int cm_wait_module_ready(s16 prcm_mod, u8 idlest_id, u8 idlest_shift) | |||
91 | return -EINVAL; | 93 | return -EINVAL; |
92 | } | 94 | } |
93 | 95 | ||
94 | return cm_ll_data->wait_module_ready(prcm_mod, idlest_id, idlest_shift); | 96 | return cm_ll_data->wait_module_ready(part, prcm_mod, idlest_reg, |
97 | idlest_shift); | ||
95 | } | 98 | } |
96 | 99 | ||
97 | /** | 100 | /** |