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

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

Merge remote-tracking branches 'asoc/fix/atmel', 'asoc/fix/compress',... 

Merge remote-tracking branches 'asoc/fix/atmel', 'asoc/fix/compress', 'asoc/fix/da7213' and 'asoc/fix/debugfs' into asoc-linus
parents d5205195 3e103a65 b0f12c61 5d764912 d1e81428

sound/soc/atmel/atmel_ssc_dai.c

+3 −2
Original line number Diff line number Diff line
@@ -299,7 +299,8 @@ static int atmel_ssc_startup(struct snd_pcm_substream *substream, 
	clk_enable(ssc_p->ssc->clk);

	ssc_p->mck_rate = clk_get_rate(ssc_p->ssc->clk);



	/* Reset the SSC to keep it at a clean status */

	/* Reset the SSC unless initialized to keep it in a clean state */

	if (!ssc_p->initialized)

		ssc_writel(ssc_p->ssc->regs, CR, SSC_BIT(CR_SWRST));



	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {

sound/soc/codecs/da7213.c

+2 −2
Original line number Diff line number Diff line
@@ -1247,8 +1247,8 @@ static int da7213_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) 
		return -EINVAL;

	}



	/* By default only 32 BCLK per WCLK is supported */

	dai_clk_mode |= DA7213_DAI_BCLKS_PER_WCLK_32;

	/* By default only 64 BCLK per WCLK is supported */

	dai_clk_mode |= DA7213_DAI_BCLKS_PER_WCLK_64;



	snd_soc_write(codec, DA7213_DAI_CLK_MODE, dai_clk_mode);

	snd_soc_update_bits(codec, DA7213_DAI_CTRL, DA7213_DAI_FORMAT_MASK,

sound/soc/soc-compress.c

+3 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) 


		dpcm_be_disconnect(fe, stream);

		fe->dpcm[stream].runtime = NULL;

		goto fe_err;

		goto path_err;

	}



	dpcm_clear_pending_state(fe, stream);
@@ -136,6 +136,8 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) 


	return 0;



path_err:

	dpcm_path_put(&list);

fe_err:

	if (fe->dai_link->compr_ops && fe->dai_link->compr_ops->shutdown)

		fe->dai_link->compr_ops->shutdown(cstream);

sound/soc/soc-core.c

+1 −2
Original line number Diff line number Diff line
@@ -2083,14 +2083,13 @@ static int soc_cleanup_card_resources(struct snd_soc_card *card) 
	/* remove auxiliary devices */

	soc_remove_aux_devices(card);



	snd_soc_dapm_free(&card->dapm);

	soc_cleanup_card_debugfs(card);



	/* remove the card */

	if (card->remove)

		card->remove(card);



	snd_soc_dapm_free(&card->dapm);



	snd_card_free(card->snd_card);

	return 0;