diff options
Diffstat (limited to 'arch/arm/mach-omap2/cm_common.c')
-rw-r--r-- | arch/arm/mach-omap2/cm_common.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/cm_common.c b/arch/arm/mach-omap2/cm_common.c index d555791cf349..83c6fa74cc31 100644 --- a/arch/arm/mach-omap2/cm_common.c +++ b/arch/arm/mach-omap2/cm_common.c | |||
@@ -68,14 +68,17 @@ void __init omap2_set_globals_cm(void __iomem *cm, void __iomem *cm2) | |||
68 | int cm_split_idlest_reg(struct clk_omap_reg *idlest_reg, s16 *prcm_inst, | 68 | int cm_split_idlest_reg(struct clk_omap_reg *idlest_reg, s16 *prcm_inst, |
69 | u8 *idlest_reg_id) | 69 | u8 *idlest_reg_id) |
70 | { | 70 | { |
71 | int ret; | ||
71 | if (!cm_ll_data->split_idlest_reg) { | 72 | if (!cm_ll_data->split_idlest_reg) { |
72 | WARN_ONCE(1, "cm: %s: no low-level function defined\n", | 73 | WARN_ONCE(1, "cm: %s: no low-level function defined\n", |
73 | __func__); | 74 | __func__); |
74 | return -EINVAL; | 75 | return -EINVAL; |
75 | } | 76 | } |
76 | 77 | ||
77 | return cm_ll_data->split_idlest_reg(idlest_reg, prcm_inst, | 78 | ret = cm_ll_data->split_idlest_reg(idlest_reg, prcm_inst, |
78 | idlest_reg_id); | 79 | idlest_reg_id); |
80 | *prcm_inst -= cm_base.offset; | ||
81 | return ret; | ||
79 | } | 82 | } |
80 | 83 | ||
81 | /** | 84 | /** |
@@ -337,6 +340,7 @@ int __init omap2_cm_base_init(void) | |||
337 | if (mem) { | 340 | if (mem) { |
338 | mem->pa = res.start + data->offset; | 341 | mem->pa = res.start + data->offset; |
339 | mem->va = data->mem + data->offset; | 342 | mem->va = data->mem + data->offset; |
343 | mem->offset = data->offset; | ||
340 | } | 344 | } |
341 | 345 | ||
342 | data->np = np; | 346 | data->np = np; |