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

Commit 8e8fbd8f authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/dapm-init' into asoc-next

parents 6bf88ab2 d77a14b5

sound/soc/atmel/snd-soc-afeb9260.c

+0 −12
Original line number Diff line number Diff line
@@ -80,17 +80,6 @@ static const struct snd_soc_dapm_route afeb9260_audio_map[] = { 
	{"MICIN", NULL, "Mic Jack"},

};



static int afeb9260_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_dapm_context *dapm = &codec->dapm;



	snd_soc_dapm_enable_pin(dapm, "Headphone Jack");

	snd_soc_dapm_enable_pin(dapm, "Line In");

	snd_soc_dapm_enable_pin(dapm, "Mic Jack");



	return 0;

}



/* Digital audio interface glue - connects codec <--> CPU */

static struct snd_soc_dai_link afeb9260_dai = {
@@ -100,7 +89,6 @@ static struct snd_soc_dai_link afeb9260_dai = { 
	.codec_dai_name = "tlv320aic23-hifi",

	.platform_name = "atmel_pcm-audio",

	.codec_name = "tlv320aic23-codec.0-001a",

	.init = afeb9260_tlv320aic23_init,

	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_IF |

		   SND_SOC_DAIFMT_CBM_CFM,

	.ops = &afeb9260_ops,

sound/soc/intel/byt-rt5640.c

+0 −6
Original line number Diff line number Diff line
@@ -100,12 +100,6 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime) 
	snd_soc_dapm_ignore_suspend(dapm, "SPORP");

	snd_soc_dapm_ignore_suspend(dapm, "SPORN");



	snd_soc_dapm_enable_pin(dapm, "Headset Mic");

	snd_soc_dapm_enable_pin(dapm, "Headphone");

	snd_soc_dapm_enable_pin(dapm, "Speaker");

	snd_soc_dapm_enable_pin(dapm, "Internal Mic");



	snd_soc_dapm_sync(dapm);

	return ret;

}

sound/soc/intel/haswell.c

+0 −6
Original line number Diff line number Diff line
@@ -89,8 +89,6 @@ static struct snd_soc_ops haswell_rt5640_ops = { 


static int haswell_rtd_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	struct sst_pdata *pdata = dev_get_platdata(rtd->platform->dev);

	struct sst_hsw *haswell = pdata->dsp;

	int ret;
@@ -104,10 +102,6 @@ static int haswell_rtd_init(struct snd_soc_pcm_runtime *rtd) 
		return ret;

	}



	/* always connected */

	snd_soc_dapm_enable_pin(dapm, "Headphones");

	snd_soc_dapm_enable_pin(dapm, "Mic");



	return 0;

}

sound/soc/kirkwood/kirkwood-t5325.c

+0 −13
Original line number Diff line number Diff line
@@ -52,18 +52,6 @@ static const struct snd_soc_dapm_route t5325_route[] = { 
	{ "MIC2",		NULL,	"Mic Jack" },

};



static int t5325_dai_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_dapm_context *dapm = &codec->dapm;



	snd_soc_dapm_enable_pin(dapm, "Mic Jack");

	snd_soc_dapm_enable_pin(dapm, "Headphone Jack");

	snd_soc_dapm_enable_pin(dapm, "Speaker");



	return 0;

}



static struct snd_soc_dai_link t5325_dai[] = {

{

	.name = "ALC5621",
@@ -74,7 +62,6 @@ static struct snd_soc_dai_link t5325_dai[] = { 
	.codec_name = "alc562x-codec.0-001a",

	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,

	.ops = &t5325_ops,

	.init = t5325_dai_init,

},

};

sound/soc/omap/ams-delta.c

+0 −2
Original line number Diff line number Diff line
@@ -541,8 +541,6 @@ static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd) 


	/* Set up initial pin constellation */

	snd_soc_dapm_disable_pin(dapm, "Mouthpiece");

	snd_soc_dapm_enable_pin(dapm, "Earpiece");

	snd_soc_dapm_enable_pin(dapm, "Microphone");

	snd_soc_dapm_disable_pin(dapm, "Speaker");

	snd_soc_dapm_disable_pin(dapm, "AGCIN");

	snd_soc_dapm_disable_pin(dapm, "AGCOUT");