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

ASoC: Use data based init for wm9712 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 7ad7dd12

sound/soc/codecs/wm9712.c

+5 −13
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ SND_SOC_DAPM_INPUT("MIC1"), 
SND_SOC_DAPM_INPUT("MIC2"),

};



static const struct snd_soc_dapm_route audio_map[] = {

static const struct snd_soc_dapm_route wm9712_audio_map[] = {

	/* virtual mixer - mixes left & right channels for spk and mono */

	{"AC97 Mixer", NULL, "Left DAC"},

	{"AC97 Mixer", NULL, "Right DAC"},
@@ -429,17 +429,6 @@ static const struct snd_soc_dapm_route audio_map[] = { 
	{"ROUT2", NULL, "Speaker PGA"},

};



static int wm9712_add_widgets(struct snd_soc_codec *codec)

{

	struct snd_soc_dapm_context *dapm = &codec->dapm;



	snd_soc_dapm_new_controls(dapm, wm9712_dapm_widgets,

				  ARRAY_SIZE(wm9712_dapm_widgets));

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



	return 0;

}



static unsigned int ac97_read(struct snd_soc_codec *codec,

	unsigned int reg)

{
@@ -651,7 +640,6 @@ static int wm9712_soc_probe(struct snd_soc_codec *codec) 
	wm9712_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

	snd_soc_add_controls(codec, wm9712_snd_ac97_controls,

				ARRAY_SIZE(wm9712_snd_ac97_controls));

	wm9712_add_widgets(codec);



	return 0;
@@ -678,6 +666,10 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9712 = { 
	.reg_word_size = sizeof(u16),

	.reg_cache_step = 2,

	.reg_cache_default = wm9712_reg,

	.dapm_widgets = wm9712_dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(wm9712_dapm_widgets),

	.dapm_routes = wm9712_audio_map,

	.num_dapm_routes = ARRAY_SIZE(wm9712_audio_map),

};



static __devinit int wm9712_probe(struct platform_device *pdev)