Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ba30f0f authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'omap-for-v3.8/cleanup-headers-asoc' into omap-for-v3.8/cleanup-headers

parents 25c7d49e 68214d99

sound/soc/omap/omap-abe-twl6040.c

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd) 
	twl6040_disconnect_pin(dapm, pdata->has_hf, "Ext Spk");

	twl6040_disconnect_pin(dapm, pdata->has_ep, "Earphone Spk");

	twl6040_disconnect_pin(dapm, pdata->has_aux, "Line Out");

	twl6040_disconnect_pin(dapm, pdata->has_vibra, "Vinrator");

	twl6040_disconnect_pin(dapm, pdata->has_vibra, "Vibrator");

	twl6040_disconnect_pin(dapm, pdata->has_hsmic, "Headset Mic");

	twl6040_disconnect_pin(dapm, pdata->has_mainmic, "Main Handset Mic");

	twl6040_disconnect_pin(dapm, pdata->has_submic, "Sub Handset Mic");

sound/soc/omap/omap-mcpdm.c

+2 −7
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
#include <sound/pcm_params.h>

#include <sound/soc.h>



#include <plat/omap_hwmod.h>

#include "omap-mcpdm.h"

#include "omap-pcm.h"
@@ -260,13 +259,9 @@ static int omap_mcpdm_dai_startup(struct snd_pcm_substream *substream, 
	mutex_lock(&mcpdm->mutex);



	if (!dai->active) {

		/* Enable watch dog for ES above ES 1.0 to avoid saturation */

		if (omap_rev() != OMAP4430_REV_ES1_0) {

		u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL);



			omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL,

					 ctrl | MCPDM_WD_EN);

		}

		omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, ctrl | MCPDM_WD_EN);

		omap_mcpdm_open_streams(mcpdm);

	}

	mutex_unlock(&mcpdm->mutex);