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

Commit 3c3f51f6 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: Convert z2 to table based DAPM init 



Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 1a2dbcbe

sound/soc/pxa/z2.c

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

};





/* Z2 machine audio_map */

/* Z2 machine audio_map */

static const struct snd_soc_dapm_route audio_map[] = {

static const struct snd_soc_dapm_route z2_audio_map[] = {





	/* headphone connected to LOUT1, ROUT1 */

	/* headphone connected to LOUT1, ROUT1 */

	{"Headphone Jack", NULL, "LOUT1"},

	{"Headphone Jack", NULL, "LOUT1"},
@@ -142,13 +142,6 @@ static int z2_wm8750_init(struct snd_soc_pcm_runtime *rtd) 
	snd_soc_dapm_disable_pin(dapm, "OUT3");

	snd_soc_dapm_disable_pin(dapm, "OUT3");

	snd_soc_dapm_disable_pin(dapm, "MONO1");

	snd_soc_dapm_disable_pin(dapm, "MONO1");





	/* Add z2 specific widgets */

	snd_soc_dapm_new_controls(dapm, wm8750_dapm_widgets,

				 ARRAY_SIZE(wm8750_dapm_widgets));



	/* Set up z2 specific audio paths */

	snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));



	/* Jack detection API stuff */

	/* Jack detection API stuff */

	ret = snd_soc_jack_new(codec, "Headset Jack", SND_JACK_HEADSET,

	ret = snd_soc_jack_new(codec, "Headset Jack", SND_JACK_HEADSET,

				&hs_jack);

				&hs_jack);
@@ -195,6 +188,11 @@ static struct snd_soc_card snd_soc_z2 = { 
	.owner		= THIS_MODULE,

	.owner		= THIS_MODULE,

	.dai_link	= &z2_dai,

	.dai_link	= &z2_dai,

	.num_links	= 1,

	.num_links	= 1,



	.dapm_widgets = wm8750_dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(wm8750_dapm_widgets),

	.dapm_routes = z2_audio_map,

	.num_dapm_routes = ARRAY_SIZE(z2_audio_map),

};

};





static struct platform_device *z2_snd_device;

static struct platform_device *z2_snd_device;