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

ASoC: Use data based init for wm9713 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 dc6fc49b

sound/soc/codecs/wm9713.c

+5 −14
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ SND_SOC_DAPM_INPUT("MIC2B"), 
SND_SOC_DAPM_VMID("VMID"),

};



static const struct snd_soc_dapm_route audio_map[] = {

static const struct snd_soc_dapm_route wm9713_audio_map[] = {

	/* left HP mixer */

	{"Left HP Mixer", "Beep Playback Switch",    "PCBEEP"},

	{"Left HP Mixer", "Voice Playback Switch",   "Voice DAC"},
@@ -644,18 +644,6 @@ static const struct snd_soc_dapm_route audio_map[] = { 
	{"Capture Mono Mux", "Right", "Right Capture Source"},

};



static int wm9713_add_widgets(struct snd_soc_codec *codec)

{

	struct snd_soc_dapm_context *dapm = &codec->dapm;



	snd_soc_dapm_new_controls(dapm, wm9713_dapm_widgets,

				  ARRAY_SIZE(wm9713_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)

{
@@ -1231,7 +1219,6 @@ static int wm9713_soc_probe(struct snd_soc_codec *codec) 


	snd_soc_add_controls(codec, wm9713_snd_ac97_controls,

				ARRAY_SIZE(wm9713_snd_ac97_controls));

	wm9713_add_widgets(codec);



	return 0;
@@ -1262,6 +1249,10 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9713 = { 
	.reg_word_size = sizeof(u16),

	.reg_cache_step = 2,

	.reg_cache_default = wm9713_reg,

	.dapm_widgets = wm9713_dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(wm9713_dapm_widgets),

	.dapm_routes = wm9713_audio_map,

	.num_dapm_routes = ARRAY_SIZE(wm9713_audio_map),

};



static __devinit int wm9713_probe(struct platform_device *pdev)