2 files changed, 13 insertions, 0 deletions

diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
index b4ac3af1160c..959cb4cb1062 100644
--- a/arch/arm/mach-omap2/mcbsp.c
+++ b/arch/arm/mach-omap2/mcbsp.c
@@ -48,6 +48,17 @@ static int omap3_enable_st_clock(unsigned int id, bool enable)
                 return omap2_clk_allow_idle(mcbsp_iclks[id]);
 }
 
+static int omap3_mcbsp_force_ick_on(struct clk *clk, bool force_on)
+{
+        if (!clk)
+                return 0;
+
+        if (force_on)
+                return omap2_clk_deny_idle(clk);
+        else
+                return omap2_clk_allow_idle(clk);
+}
+
 static int __init omap_init_mcbsp(struct omap_hwmod *oh, void *unused)
 {
         int id, count = 1;
@@ -97,6 +108,7 @@ static int __init omap_init_mcbsp(struct omap_hwmod *oh, void *unused)
                 oh_device[1] = omap_hwmod_lookup((
                 (struct omap_mcbsp_dev_attr *)(oh->dev_attr))->sidetone);
                 pdata->enable_st_clock = omap3_enable_st_clock;
+                pdata->force_ick_on = omap3_mcbsp_force_ick_on;
                 sprintf(clk_name, "mcbsp%d_ick", id);
                 mcbsp_iclks[id] = clk_get(NULL, clk_name);
                 count++;
diff --git a/include/linux/platform_data/asoc-ti-mcbsp.h b/include/linux/platform_data/asoc-ti-mcbsp.h
index 3c73c045f8da..73e5e832fa23 100644
--- a/include/linux/platform_data/asoc-ti-mcbsp.h
+++ b/include/linux/platform_data/asoc-ti-mcbsp.h
@@ -45,6 +45,7 @@ struct omap_mcbsp_platform_data {
         bool has_wakeup; /* Wakeup capability */
         bool has_ccr; /* Transceiver has configuration control registers */
         int (*enable_st_clock)(unsigned int, bool);
+        int (*force_ick_on)(struct clk *clk, bool force_on);
 };
 
 /**