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

Commit 4f5448ae authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Convert Simtec machines to table based DAPM init 



Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 6179b772

sound/soc/samsung/s3c24xx_simtec_hermes.c

+5 −5
Original line number Diff line number Diff line
@@ -65,11 +65,6 @@ static int simtec_hermes_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_new_controls(dapm, dapm_widgets,

				  ARRAY_SIZE(dapm_widgets));



	snd_soc_dapm_add_routes(dapm, base_map, ARRAY_SIZE(base_map));



	snd_soc_dapm_enable_pin(dapm, "Headphone Jack");

	snd_soc_dapm_enable_pin(dapm, "Line In");

	snd_soc_dapm_enable_pin(dapm, "Line Out");
@@ -95,6 +90,11 @@ static struct snd_soc_card snd_soc_machine_simtec_aic33 = { 
	.name		= "Simtec-Hermes",

	.dai_link	= &simtec_dai_aic33,

	.num_links	= 1,



	.dapm_widgets	= dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(dapm_widgets),

	.dapm_routes	= base_map,

	.num_dapm_routes = ARRAY_SIZE(base_map),

};



static int __devinit simtec_audio_hermes_probe(struct platform_device *pd)

sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c

+5 −5
Original line number Diff line number Diff line
@@ -54,11 +54,6 @@ static int simtec_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_new_controls(dapm, dapm_widgets,

				  ARRAY_SIZE(dapm_widgets));



	snd_soc_dapm_add_routes(dapm, base_map, ARRAY_SIZE(base_map));



	snd_soc_dapm_enable_pin(dapm, "Headphone Jack");

	snd_soc_dapm_enable_pin(dapm, "Line In");

	snd_soc_dapm_enable_pin(dapm, "Line Out");
@@ -84,6 +79,11 @@ static struct snd_soc_card snd_soc_machine_simtec_aic23 = { 
	.name		= "Simtec",

	.dai_link	= &simtec_dai_aic23,

	.num_links	= 1,



	.dapm_widgets	= dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(dapm_widgets),

	.dapm_routes	= base_map,

	.num_dapm_routes = ARRAY_SIZE(base_map),

};



static int __devinit simtec_audio_tlv320aic23_probe(struct platform_device *pd)