Commit 978d4ddb authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/suspend', 'asoc/topic/tas2552',... 

Merge remote-tracking branches 'asoc/topic/suspend', 'asoc/topic/tas2552', 'asoc/topic/tegra', 'asoc/topic/tlv320aic31xx' and 'asoc/topic/tlv320aic3x' into asoc-next
parents 248519c0 83a7fc98 be1aa3ea 9766a1cf 9cfb7690 31d9f8fa

Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ Required properties: 


Optional properties:

- nvidia,hp-det-gpios : The GPIO that detect headphones are plugged in

- nvidia,mic-det-gpios : The GPIO that detect microphones are plugged in



Example:

sound/soc/codecs/88pm860x-codec.c

+0 −3
Original line number Diff line number Diff line
@@ -1337,8 +1337,6 @@ static int pm860x_probe(struct snd_soc_codec *codec) 
		}

	}



	pm860x_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	return 0;



out:
@@ -1354,7 +1352,6 @@ static int pm860x_remove(struct snd_soc_codec *codec) 


	for (i = 3; i >= 0; i--)

		free_irq(pm860x->irq[i], pm860x);

	pm860x_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}

sound/soc/codecs/cs42l52.c

+1 −19
Original line number Diff line number Diff line
@@ -946,20 +946,6 @@ static struct snd_soc_dai_driver cs42l52_dai = { 
		.ops = &cs42l52_ops,

};



static int cs42l52_suspend(struct snd_soc_codec *codec)

{

	cs42l52_set_bias_level(codec, SND_SOC_BIAS_OFF);



	return 0;

}



static int cs42l52_resume(struct snd_soc_codec *codec)

{

	cs42l52_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	return 0;

}



static int beep_rates[] = {

	261, 522, 585, 667, 706, 774, 889, 1000,

	1043, 1200, 1333, 1412, 1600, 1714, 2000, 2182
@@ -1104,8 +1090,6 @@ static int cs42l52_probe(struct snd_soc_codec *codec) 


	cs42l52_init_beep(codec);



	cs42l52_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	cs42l52->sysclk = CS42L52_DEFAULT_CLK;

	cs42l52->config.format = CS42L52_DEFAULT_FORMAT;
@@ -1115,7 +1099,6 @@ static int cs42l52_probe(struct snd_soc_codec *codec) 
static int cs42l52_remove(struct snd_soc_codec *codec)

{

	cs42l52_free_beep(codec);

	cs42l52_set_bias_level(codec, SND_SOC_BIAS_OFF);



	return 0;

}
@@ -1123,9 +1106,8 @@ static int cs42l52_remove(struct snd_soc_codec *codec) 
static struct snd_soc_codec_driver soc_codec_dev_cs42l52 = {

	.probe = cs42l52_probe,

	.remove = cs42l52_remove,

	.suspend = cs42l52_suspend,

	.resume = cs42l52_resume,

	.set_bias_level = cs42l52_set_bias_level,

	.suspend_bias_off = true,



	.dapm_widgets = cs42l52_dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(cs42l52_dapm_widgets),

sound/soc/codecs/cs42l56.c

+1 −19
Original line number Diff line number Diff line
@@ -1016,20 +1016,6 @@ static struct snd_soc_dai_driver cs42l56_dai = { 
		.ops = &cs42l56_ops,

};



static int cs42l56_suspend(struct snd_soc_codec *codec)

{

	cs42l56_set_bias_level(codec, SND_SOC_BIAS_OFF);



	return 0;

}



static int cs42l56_resume(struct snd_soc_codec *codec)

{

	cs42l56_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	return 0;

}



static int beep_freq[] = {

	261, 522, 585, 667, 706, 774, 889, 1000,

	1043, 1200, 1333, 1412, 1600, 1714, 2000, 2182
@@ -1168,15 +1154,12 @@ static int cs42l56_probe(struct snd_soc_codec *codec) 
{

	cs42l56_init_beep(codec);



	cs42l56_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	return 0;

}



static int cs42l56_remove(struct snd_soc_codec *codec)

{

	cs42l56_free_beep(codec);

	cs42l56_set_bias_level(codec, SND_SOC_BIAS_OFF);



	return 0;

}
@@ -1184,9 +1167,8 @@ static int cs42l56_remove(struct snd_soc_codec *codec) 
static struct snd_soc_codec_driver soc_codec_dev_cs42l56 = {

	.probe = cs42l56_probe,

	.remove = cs42l56_remove,

	.suspend = cs42l56_suspend,

	.resume = cs42l56_resume,

	.set_bias_level = cs42l56_set_bias_level,

	.suspend_bias_off = true,



	.dapm_widgets = cs42l56_dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(cs42l56_dapm_widgets),

sound/soc/codecs/cs42l73.c

+1 −24
Original line number Diff line number Diff line
@@ -1330,25 +1330,10 @@ static struct snd_soc_dai_driver cs42l73_dai[] = { 
	 }

};



static int cs42l73_suspend(struct snd_soc_codec *codec)

{

	cs42l73_set_bias_level(codec, SND_SOC_BIAS_OFF);



	return 0;

}



static int cs42l73_resume(struct snd_soc_codec *codec)

{

	cs42l73_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

	return 0;

}



static int cs42l73_probe(struct snd_soc_codec *codec)

{

	struct cs42l73_private *cs42l73 = snd_soc_codec_get_drvdata(codec);



	cs42l73_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	/* Set Charge Pump Frequency */

	if (cs42l73->pdata.chgfreq)

		snd_soc_update_bits(codec, CS42L73_CPFCHC,
@@ -1362,18 +1347,10 @@ static int cs42l73_probe(struct snd_soc_codec *codec) 
	return 0;

}



static int cs42l73_remove(struct snd_soc_codec *codec)

{

	cs42l73_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}



static struct snd_soc_codec_driver soc_codec_dev_cs42l73 = {

	.probe = cs42l73_probe,

	.remove = cs42l73_remove,

	.suspend = cs42l73_suspend,

	.resume = cs42l73_resume,

	.set_bias_level = cs42l73_set_bias_level,

	.suspend_bias_off = true,



	.dapm_widgets = cs42l73_dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(cs42l73_dapm_widgets),