3 files changed, 7 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)
 int cm_split_idlest_reg(struct clk_omap_reg *idlest_reg, s16 *prcm_inst,
                         u8 *idlest_reg_id)
 {
+        int ret;
         if (!cm_ll_data->split_idlest_reg) {
                 WARN_ONCE(1, "cm: %s: no low-level function defined\n",
                           __func__);
                 return -EINVAL;
         }
 
-        return cm_ll_data->split_idlest_reg(idlest_reg, prcm_inst,
+        ret = cm_ll_data->split_idlest_reg(idlest_reg, prcm_inst,
                                            idlest_reg_id);
+        *prcm_inst -= cm_base.offset;
+        return ret;
 }
 
 /**
@@ -337,6 +340,7 @@ int __init omap2_cm_base_init(void)
                 if (mem) {
                         mem->pa = res.start + data->offset;
                         mem->va = data->mem + data->offset;
+                        mem->offset = data->offset;
                 }
 
                 data->np = np;
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index d2106ae4410a..52c9d585b44d 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -1646,6 +1646,7 @@ static struct omap_hwmod omap3xxx_mmc3_hwmod = {
         .main_clk       = "mmchs3_fck",
         .prcm           = {
                 .omap2 = {
+                        .module_offs = CORE_MOD,
                         .prcm_reg_id = 1,
                         .module_bit = OMAP3430_EN_MMC3_SHIFT,
                         .idlest_reg_id = 1,
diff --git a/arch/arm/mach-omap2/prcm-common.h b/arch/arm/mach-omap2/prcm-common.h
index 0592b23902c6..0977da0dab76 100644
--- a/arch/arm/mach-omap2/prcm-common.h
+++ b/arch/arm/mach-omap2/prcm-common.h
@@ -528,6 +528,7 @@ struct omap_prcm_irq_setup {
 struct omap_domain_base {
         u32 pa;
         void __iomem *va;
+        s16 offset;
 };
 
 /**