---

yaml
---
r: 293479
b: refs/heads/master
c: e386615
h: refs/heads/master
i:
  293477: 6d6d652
  293475: 166a287
  293471: ac85b54
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08905d8ab4d4a264c5a700b04b9cbafe4f381037
+refs/heads/master: e386615c01d37145aa27fd06d1f8de26f1acbb7f

trunk/sound/soc/omap/mcbsp.c

@@ -548,6 +548,16 @@ void omap_mcbsp_free(struct omap_mcbsp *mcbsp)
 
 	reg_cache = mcbsp->reg_cache;
 
+	/*
+	 * Select CLKS source from internal source unconditionally before
+	 * marking the McBSP port as free.
+	 * If the external clock source via MCBSP_CLKS pin has been selected the
+	 * system will refuse to enter idle if the CLKS pin source is not reset
+	 * back to internal source.
+	 */
+	if (!cpu_class_is_omap1())
+		omap2_mcbsp_set_clks_src(mcbsp, MCBSP_CLKS_PRCM_SRC);
+
 	spin_lock(&mcbsp->lock);
 	if (mcbsp->free)
 		dev_err(mcbsp->dev, "McBSP%d was not reserved\n", mcbsp->id);