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

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

Merge remote-tracking branches 'asoc/topic/tegra', 'asoc/topic/tlv320aic23'... 

Merge remote-tracking branches 'asoc/topic/tegra', 'asoc/topic/tlv320aic23' and 'asoc/topic/ux500' into asoc-next
parents e3438187 1b13fe71 f580f8af 5cf57f0f

sound/soc/codecs/tlv320aic23-i2c.c

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static int tlv320aic23_i2c_probe(struct i2c_client *i2c, 
	return tlv320aic23_probe(&i2c->dev, regmap);

}



static int __exit tlv320aic23_i2c_remove(struct i2c_client *i2c)

static int tlv320aic23_i2c_remove(struct i2c_client *i2c)

{

	snd_soc_unregister_codec(&i2c->dev);

	return 0;
@@ -56,7 +56,7 @@ static struct i2c_driver tlv320aic23_i2c_driver = { 
		   .of_match_table = of_match_ptr(tlv320aic23_of_match),

		   },

	.probe = tlv320aic23_i2c_probe,

	.remove = __exit_p(tlv320aic23_i2c_remove),

	.remove = tlv320aic23_i2c_remove,

	.id_table = tlv320aic23_id,

};

sound/soc/tegra/tegra_alc5632.c

+1 −4
Original line number Diff line number Diff line
@@ -101,9 +101,6 @@ static const struct snd_kcontrol_new tegra_alc5632_controls[] = { 


static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_codec *codec = codec_dai->codec;

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(rtd->card);



	snd_soc_card_jack_new(rtd->card, "Headset Jack", SND_JACK_HEADSET,
@@ -118,7 +115,7 @@ static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd) 
						&tegra_alc5632_hp_jack_gpio);

	}



	snd_soc_dapm_force_enable_pin(dapm, "MICBIAS1");

	snd_soc_dapm_force_enable_pin(&rtd->card->dapm, "MICBIAS1");



	return 0;

}

sound/soc/tegra/tegra_rt5677.c

+1 −5
Original line number Diff line number Diff line
@@ -141,9 +141,6 @@ static const struct snd_kcontrol_new tegra_rt5677_controls[] = { 


static int tegra_rt5677_asoc_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_codec *codec = codec_dai->codec;

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	struct tegra_rt5677 *machine = snd_soc_card_get_drvdata(rtd->card);



	snd_soc_card_jack_new(rtd->card, "Headphone Jack", SND_JACK_HEADPHONE,
@@ -167,7 +164,7 @@ static int tegra_rt5677_asoc_init(struct snd_soc_pcm_runtime *rtd) 
				&tegra_rt5677_mic_jack_gpio);

	}



	snd_soc_dapm_force_enable_pin(dapm, "MICBIAS1");

	snd_soc_dapm_force_enable_pin(&rtd->card->dapm, "MICBIAS1");



	return 0;

}
@@ -329,7 +326,6 @@ static const struct of_device_id tegra_rt5677_of_match[] = { 
static struct platform_driver tegra_rt5677_driver = {

	.driver = {

		.name = DRV_NAME,

		.owner = THIS_MODULE,

		.pm = &snd_soc_pm_ops,

		.of_match_table = tegra_rt5677_of_match,

	},

sound/soc/tegra/tegra_wm8903.c

+1 −2
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd) 
{

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_codec *codec = codec_dai->codec;

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	struct snd_soc_card *card = rtd->card;

	struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);
@@ -193,7 +192,7 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd) 
	wm8903_mic_detect(codec, &tegra_wm8903_mic_jack, SND_JACK_MICROPHONE,

				0);



	snd_soc_dapm_force_enable_pin(dapm, "MICBIAS");

	snd_soc_dapm_force_enable_pin(&card->dapm, "MICBIAS");



	return 0;

}

sound/soc/tegra/tegra_wm9712.c

+1 −5
Original line number Diff line number Diff line
@@ -46,11 +46,7 @@ static const struct snd_soc_dapm_widget tegra_wm9712_dapm_widgets[] = { 


static int tegra_wm9712_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_codec *codec = codec_dai->codec;

	struct snd_soc_dapm_context *dapm = &codec->dapm;



	return snd_soc_dapm_force_enable_pin(dapm, "Mic Bias");

	return snd_soc_dapm_force_enable_pin(&rtd->card->dapm, "Mic Bias");

}



static struct snd_soc_dai_link tegra_wm9712_dai = {