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

Commit 8f3112d7 authored by Mark Brown's avatar Mark Brown Committed by Jaroslav Kysela
Browse files

[ALSA] soc - neo1973_wm8753 - Convert to bulk DAPM registration APIs 



Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Graeme Gregory <graeme@openmoko.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 51e6a841

sound/soc/s3c24xx/neo1973_wm8753.c

+6 −11
Original line number Diff line number Diff line
@@ -425,8 +425,7 @@ static const struct snd_soc_dapm_widget wm8753_dapm_widgets[] = { 
};





/* example machine audio_mapnections */

static const char *audio_map[][3] = {

static const struct snd_soc_dapm_route dapm_routes[] = {



	/* Connections to the lm4857 amp */

	{"Audio Out", NULL, "LOUT1"},
@@ -449,8 +448,6 @@ static const char *audio_map[][3] = { 


	/* Connect the ALC pins */

	{"ACIN", NULL, "ACOP"},



	{NULL, NULL, NULL},

};



static const char *lm4857_mode[] = {
@@ -526,8 +523,8 @@ static int neo1973_wm8753_init(struct snd_soc_codec *codec) 
	set_scenario_endpoints(codec, NEO_AUDIO_OFF);



	/* Add neo1973 specific widgets */

	for (i = 0; i < ARRAY_SIZE(wm8753_dapm_widgets); i++)

		snd_soc_dapm_new_control(codec, &wm8753_dapm_widgets[i]);

	snd_soc_dapm_new_controls(codec, wm8753_dapm_widgets,

				  ARRAY_SIZE(wm8753_dapm_widgets));



	/* add neo1973 specific controls */

	for (i = 0; i < ARRAY_SIZE(wm8753_neo1973_controls); i++) {
@@ -538,11 +535,9 @@ static int neo1973_wm8753_init(struct snd_soc_codec *codec) 
			return err;

	}



	/* set up neo1973 specific audio path audio_mapnects */

	for (i = 0; audio_map[i][0] != NULL; i++) {

		snd_soc_dapm_connect_input(codec, audio_map[i][0],

			audio_map[i][1], audio_map[i][2]);

	}

	/* set up neo1973 specific audio routes */

	err = snd_soc_dapm_add_routes(codec, dapm_routes,

				      ARRAY_SIZE(dapm_routes));



	snd_soc_dapm_sync_endpoints(codec);

	return 0;