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

Commit 97a58d6e authored by Lu Guanqun's avatar Lu Guanqun Committed by Mark Brown
Browse files

ASoC: Use data based init for wm9705 DAPM 



Signed-off-by: default avatarLu Guanqun <guanqun.lu@intel.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 98334778

sound/soc/codecs/wm9705.c

+5 −13
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static const struct snd_soc_dapm_widget wm9705_dapm_widgets[] = { 
 * constantly enabled, we use the mutes on those inputs to simulate such

 * controls.

 */

static const struct snd_soc_dapm_route audio_map[] = {

static const struct snd_soc_dapm_route wm9705_audio_map[] = {

	/* HP mixer */

	{"HP Mixer", "PCBeep Playback Switch", "PCBEEP PGA"},

	{"HP Mixer", "CD Playback Switch", "CD PGA"},
@@ -200,17 +200,6 @@ static const struct snd_soc_dapm_route audio_map[] = { 
	{"Right ADC", NULL, "ADC PGA"},

};



static int wm9705_add_widgets(struct snd_soc_codec *codec)

{

	struct snd_soc_dapm_context *dapm = &codec->dapm;



	snd_soc_dapm_new_controls(dapm, wm9705_dapm_widgets,

					ARRAY_SIZE(wm9705_dapm_widgets));

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



	return 0;

}



/* We use a register cache to enhance read performance. */

static unsigned int ac97_read(struct snd_soc_codec *codec, unsigned int reg)

{
@@ -364,7 +353,6 @@ static int wm9705_soc_probe(struct snd_soc_codec *codec) 


	snd_soc_add_controls(codec, wm9705_snd_ac97_controls,

				ARRAY_SIZE(wm9705_snd_ac97_controls));

	wm9705_add_widgets(codec);



	return 0;
@@ -390,6 +378,10 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9705 = { 
	.reg_word_size = sizeof(u16),

	.reg_cache_step = 2,

	.reg_cache_default = wm9705_reg,

	.dapm_widgets = wm9705_dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(wm9705_dapm_widgets),

	.dapm_routes = wm9705_audio_map,

	.num_dapm_routes = ARRAY_SIZE(wm9705_audio_map),

};



static __devinit int wm9705_probe(struct platform_device *pdev)