Commit a6c96672 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v5.10-rc2' of... 

Merge tag 'asoc-fix-v5.10-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v5.10

A batch of driver specific fixes that have come up since the merge
window, nothing particularly major here but all good to have.
parents 0938ecae f9d7c6eb

sound/soc/atmel/mchp-spdiftx.c

+0 −1
Original line number Diff line number Diff line
@@ -487,7 +487,6 @@ static int mchp_spdiftx_hw_params(struct snd_pcm_substream *substream, 
	}

	mchp_spdiftx_channel_status_write(dev);

	spin_unlock_irqrestore(&ctrl->lock, flags);

	mr |= SPDIFTX_MR_VALID1 | SPDIFTX_MR_VALID2;



	if (dev->gclk_enabled) {

		clk_disable_unprepare(dev->gclk);

sound/soc/codecs/cs42l51.c

+21 −1
Original line number Diff line number Diff line
@@ -254,8 +254,28 @@ static const struct snd_soc_dapm_widget cs42l51_dapm_widgets[] = { 
		&cs42l51_adcr_mux_controls),

};



static int mclk_event(struct snd_soc_dapm_widget *w,

		      struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm);

	struct cs42l51_private *cs42l51 = snd_soc_component_get_drvdata(comp);



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		return clk_prepare_enable(cs42l51->mclk_handle);

	case SND_SOC_DAPM_POST_PMD:

		/* Delay mclk shutdown to fulfill power-down sequence requirements */

		msleep(20);

		clk_disable_unprepare(cs42l51->mclk_handle);

		break;

	}



	return 0;

}



static const struct snd_soc_dapm_widget cs42l51_dapm_mclk_widgets[] = {

	SND_SOC_DAPM_CLOCK_SUPPLY("MCLK")

	SND_SOC_DAPM_SUPPLY("MCLK", SND_SOC_NOPM, 0, 0, mclk_event,

			    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),

};



static const struct snd_soc_dapm_route cs42l51_routes[] = {

sound/soc/codecs/wcd9335.c

+1 −1
Original line number Diff line number Diff line
@@ -618,7 +618,7 @@ static const char * const sb_tx8_mux_text[] = { 
	"ZERO", "RX_MIX_TX8", "DEC8", "DEC8_192"

};



static const DECLARE_TLV_DB_SCALE(digital_gain, 0, 1, 0);

static const DECLARE_TLV_DB_SCALE(digital_gain, -8400, 100, -8400);

static const DECLARE_TLV_DB_SCALE(line_gain, 0, 7, 1);

static const DECLARE_TLV_DB_SCALE(analog_gain, 0, 25, 1);

static const DECLARE_TLV_DB_SCALE(ear_pa_gain, 0, 150, 0);

sound/soc/codecs/wcd934x.c

+1 −1
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ struct wcd_iir_filter_ctl { 
	struct soc_bytes_ext bytes_ext;

};



static const DECLARE_TLV_DB_SCALE(digital_gain, 0, 1, 0);

static const DECLARE_TLV_DB_SCALE(digital_gain, -8400, 100, -8400);

static const DECLARE_TLV_DB_SCALE(line_gain, 0, 7, 1);

static const DECLARE_TLV_DB_SCALE(analog_gain, 0, 25, 1);

static const DECLARE_TLV_DB_SCALE(ear_pa_gain, 0, 150, 0);

sound/soc/codecs/wsa881x.c

+2 −0
Original line number Diff line number Diff line
@@ -1026,6 +1026,8 @@ static struct snd_soc_dai_driver wsa881x_dais[] = { 
		.id = 0,

		.playback = {

			.stream_name = "SPKR Playback",

			.rates = SNDRV_PCM_RATE_48000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.rate_max = 48000,

			.rate_min = 48000,

			.channels_min = 1,

CRA Git | Maintained and supported by SUSTech CRA and CCSE