Commit cfb89f2e authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/max98371', 'asoc/fix/nau8825',... 

Merge remote-tracking branches 'asoc/fix/max98371', 'asoc/fix/nau8825', 'asoc/fix/omap', 'asoc/fix/samsung', 'asoc/fix/simple' and 'asoc/fix/wm2000' into asoc-linus
parents e8f0f8aa 209c721c 06746c67 a8719670 1bc610e7 1f85e118 fa54aade

Documentation/devicetree/bindings/sound/omap-mcpdm.txt

+0 −10
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ Required properties: 
- interrupts: Interrupt number for McPDM

- interrupt-parent: The parent interrupt controller

- ti,hwmods: Name of the hwmod associated to the McPDM

- clocks:  phandle for the pdmclk provider, likely <&twl6040>

- clock-names: Must be "pdmclk"



Example:
@@ -21,11 +19,3 @@ mcpdm: mcpdm@40132000 { 
	interrupt-parent = <&gic>;

	ti,hwmods = "mcpdm";

};
 


In board DTS file the pdmclk needs to be added:



&mcpdm {

	clocks = <&twl6040>;

	clock-names = "pdmclk";

	status = "okay";

};

sound/soc/codecs/max98371.c

+1 −0
Original line number Diff line number Diff line
@@ -412,6 +412,7 @@ static int max98371_i2c_remove(struct i2c_client *client) 


static const struct i2c_device_id max98371_i2c_id[] = {

	{ "max98371", 0 },

	{ }

};



MODULE_DEVICE_TABLE(i2c, max98371_i2c_id);

sound/soc/codecs/nau8825.c

+32 −46
Original line number Diff line number Diff line
@@ -212,31 +212,6 @@ static const unsigned short logtable[256] = { 
	0xfa2f, 0xfaea, 0xfba5, 0xfc60, 0xfd1a, 0xfdd4, 0xfe8e, 0xff47

};



static struct snd_soc_dai *nau8825_get_codec_dai(struct nau8825 *nau8825)

{

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(nau8825->dapm);

	struct snd_soc_component *component = &codec->component;

	struct snd_soc_dai *codec_dai, *_dai;



	list_for_each_entry_safe(codec_dai, _dai, &component->dai_list, list) {

		if (!strncmp(codec_dai->name, NUVOTON_CODEC_DAI,

			strlen(NUVOTON_CODEC_DAI)))

			return codec_dai;

	}

	return NULL;

}



static bool nau8825_dai_is_active(struct nau8825 *nau8825)

{

	struct snd_soc_dai *codec_dai = nau8825_get_codec_dai(nau8825);



	if (codec_dai) {

		if (codec_dai->playback_active || codec_dai->capture_active)

			return true;

	}

	return false;

}



/**

 * nau8825_sema_acquire - acquire the semaphore of nau88l25

 * @nau8825:  component to register the codec private data with
@@ -250,21 +225,28 @@ static bool nau8825_dai_is_active(struct nau8825 *nau8825) 
 * Acquires the semaphore without jiffies. If no more tasks are allowed

 * to acquire the semaphore, calling this function will put the task to

 * sleep until the semaphore is released.

 * It returns if the semaphore was acquired.

 * If the semaphore is not released within the specified number of jiffies,

 * this function returns -ETIME.

 * If the sleep is interrupted by a signal, this function will return -EINTR.

 * It returns 0 if the semaphore was acquired successfully.

 */

static void nau8825_sema_acquire(struct nau8825 *nau8825, long timeout)

static int nau8825_sema_acquire(struct nau8825 *nau8825, long timeout)

{

	int ret;



	if (timeout)

	if (timeout) {

		ret = down_timeout(&nau8825->xtalk_sem, timeout);

	else

		if (ret < 0)

			dev_warn(nau8825->dev, "Acquire semaphone timeout\n");

	} else {

		ret = down_interruptible(&nau8825->xtalk_sem);



		if (ret < 0)

			dev_warn(nau8825->dev, "Acquire semaphone fail\n");

	}



	return ret;

}



/**

 * nau8825_sema_release - release the semaphore of nau88l25

 * @nau8825:  component to register the codec private data with
@@ -1205,6 +1187,8 @@ static int nau8825_hw_params(struct snd_pcm_substream *substream, 
	struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec);

	unsigned int val_len = 0;



	nau8825_sema_acquire(nau8825, 2 * HZ);



	switch (params_width(params)) {

	case 16:

		val_len |= NAU8825_I2S_DL_16;
@@ -1225,6 +1209,9 @@ static int nau8825_hw_params(struct snd_pcm_substream *substream, 
	regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL1,

		NAU8825_I2S_DL_MASK, val_len);



	/* Release the semaphone. */

	nau8825_sema_release(nau8825);



	return 0;

}
@@ -1234,6 +1221,8 @@ static int nau8825_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) 
	struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec);

	unsigned int ctrl1_val = 0, ctrl2_val = 0;



	nau8825_sema_acquire(nau8825, 2 * HZ);



	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {

	case SND_SOC_DAIFMT_CBM_CFM:

		ctrl2_val |= NAU8825_I2S_MS_MASTER;
@@ -1282,6 +1271,9 @@ static int nau8825_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) 
	regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL2,

		NAU8825_I2S_MS_MASK, ctrl2_val);



	/* Release the semaphone. */

	nau8825_sema_release(nau8825);



	return 0;

}
@@ -1611,8 +1603,11 @@ static irqreturn_t nau8825_interrupt(int irq, void *data) 
					 * cess and restore changes if process

					 * is ongoing when ejection.

					 */

					int ret;

					nau8825->xtalk_protect = true;

					nau8825_sema_acquire(nau8825, 0);

					ret = nau8825_sema_acquire(nau8825, 0);

					if (ret < 0)

						nau8825->xtalk_protect = false;

				}

				/* Startup cross talk detection process */

				nau8825->xtalk_state = NAU8825_XTALK_PREPARE;
@@ -2238,23 +2233,14 @@ static int __maybe_unused nau8825_suspend(struct snd_soc_codec *codec) 
static int __maybe_unused nau8825_resume(struct snd_soc_codec *codec)

{

	struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec);

	int ret;



	regcache_cache_only(nau8825->regmap, false);

	regcache_sync(nau8825->regmap);

	if (nau8825_is_jack_inserted(nau8825->regmap)) {

		/* If the jack is inserted, we need to check whether the play-

		 * back is active before suspend. If active, the driver has to

		 * raise the protection for cross talk function to avoid the

		 * playback recovers before cross talk process finish. Other-

		 * wise, the playback will be interfered by cross talk func-

		 * tion. It is better to apply hardware related parameters

		 * before starting playback or record.

		 */

		if (nau8825_dai_is_active(nau8825)) {

	nau8825->xtalk_protect = true;

			nau8825_sema_acquire(nau8825, 0);

		}

	}

	ret = nau8825_sema_acquire(nau8825, 0);

	if (ret < 0)

		nau8825->xtalk_protect = false;

	enable_irq(nau8825->irq);



	return 0;

sound/soc/codecs/wm2000.c

+1 −1
Original line number Diff line number Diff line
@@ -581,7 +581,7 @@ static int wm2000_anc_transition(struct wm2000_priv *wm2000, 
	if (anc_transitions[i].dest == ANC_OFF)

		clk_disable_unprepare(wm2000->mclk);



	return ret;

	return 0;

}



static int wm2000_anc_set_mode(struct wm2000_priv *wm2000)

sound/soc/generic/Makefile

+3 −3
Original line number Diff line number Diff line 
obj-$(CONFIG_SND_SIMPLE_CARD_UTILS) := simple-card-utils.o



snd-soc-simple-card-utils-objs	:= simple-card-utils.o

snd-soc-simple-card-objs	:= simple-card.o



obj-$(CONFIG_SND_SIMPLE_CARD_UTILS)	+= snd-soc-simple-card-utils.o

obj-$(CONFIG_SND_SIMPLE_CARD)		+= snd-soc-simple-card.o