Unverified Commit 3b9b1490 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/for-5.11' into asoc-linus

parents 92bf2261 bd8036eb

sound/soc/codecs/cpcap.c

+6 −6
Original line number Diff line number Diff line
@@ -1264,12 +1264,12 @@ static int cpcap_voice_hw_params(struct snd_pcm_substream *substream, 


	if (direction == SNDRV_PCM_STREAM_CAPTURE) {

		mask = 0x0000;

		mask |= CPCAP_BIT_MIC1_RX_TIMESLOT0;

		mask |= CPCAP_BIT_MIC1_RX_TIMESLOT1;

		mask |= CPCAP_BIT_MIC1_RX_TIMESLOT2;

		mask |= CPCAP_BIT_MIC2_TIMESLOT0;

		mask |= CPCAP_BIT_MIC2_TIMESLOT1;

		mask |= CPCAP_BIT_MIC2_TIMESLOT2;

		mask |= BIT(CPCAP_BIT_MIC1_RX_TIMESLOT0);

		mask |= BIT(CPCAP_BIT_MIC1_RX_TIMESLOT1);

		mask |= BIT(CPCAP_BIT_MIC1_RX_TIMESLOT2);

		mask |= BIT(CPCAP_BIT_MIC2_TIMESLOT0);

		mask |= BIT(CPCAP_BIT_MIC2_TIMESLOT1);

		mask |= BIT(CPCAP_BIT_MIC2_TIMESLOT2);

		val = 0x0000;

		if (channels >= 2)

			val = BIT(CPCAP_BIT_MIC1_RX_TIMESLOT0);

sound/soc/codecs/max98373.c

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ static int max98373_feedback_get(struct snd_kcontrol *kcontrol, 
		}

	}



	return snd_soc_put_volsw(kcontrol, ucontrol);

	return snd_soc_get_volsw(kcontrol, ucontrol);

}



static const struct snd_kcontrol_new max98373_snd_controls[] = {

sound/soc/codecs/rt5682-i2c.c

+3 −0
Original line number Diff line number Diff line
@@ -273,6 +273,9 @@ static void rt5682_i2c_shutdown(struct i2c_client *client) 
{

	struct rt5682_priv *rt5682 = i2c_get_clientdata(client);



	cancel_delayed_work_sync(&rt5682->jack_detect_work);

	cancel_delayed_work_sync(&rt5682->jd_check_work);



	rt5682_reset(rt5682);

}

sound/soc/codecs/rt5682-sdw.c

+3 −1
Original line number Diff line number Diff line
@@ -703,7 +703,7 @@ static int rt5682_sdw_remove(struct sdw_slave *slave) 
	struct rt5682_priv *rt5682 = dev_get_drvdata(&slave->dev);



	if (rt5682 && rt5682->hw_init)

		cancel_delayed_work(&rt5682->jack_detect_work);

		cancel_delayed_work_sync(&rt5682->jack_detect_work);



	return 0;

}
@@ -721,6 +721,8 @@ static int __maybe_unused rt5682_dev_suspend(struct device *dev) 
	if (!rt5682->hw_init)

		return 0;



	cancel_delayed_work_sync(&rt5682->jack_detect_work);



	regcache_cache_only(rt5682->regmap, true);

	regcache_mark_dirty(rt5682->regmap);

sound/soc/codecs/rt5682.c

+6 −0
Original line number Diff line number Diff line
@@ -2906,6 +2906,9 @@ static int rt5682_suspend(struct snd_soc_component *component) 
{

	struct rt5682_priv *rt5682 = snd_soc_component_get_drvdata(component);



	if (rt5682->is_sdw)

		return 0;



	regcache_cache_only(rt5682->regmap, true);

	regcache_mark_dirty(rt5682->regmap);

	return 0;
@@ -2915,6 +2918,9 @@ static int rt5682_resume(struct snd_soc_component *component) 
{

	struct rt5682_priv *rt5682 = snd_soc_component_get_drvdata(component);



	if (rt5682->is_sdw)

		return 0;



	regcache_cache_only(rt5682->regmap, false);

	regcache_sync(rt5682->regmap);