ASoC: Use data based init for wm8711 DAPM
Signed-off-by: Lu Guanqun <guanqun.lu@intel.com> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
8428edf96e
commit
2031400061
|
@ -77,7 +77,7 @@ SND_SOC_DAPM_OUTPUT("ROUT"),
|
||||||
SND_SOC_DAPM_OUTPUT("RHPOUT"),
|
SND_SOC_DAPM_OUTPUT("RHPOUT"),
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct snd_soc_dapm_route intercon[] = {
|
static const struct snd_soc_dapm_route wm8711_intercon[] = {
|
||||||
/* output mixer */
|
/* output mixer */
|
||||||
{"Output Mixer", "Line Bypass Switch", "Line Input"},
|
{"Output Mixer", "Line Bypass Switch", "Line Input"},
|
||||||
{"Output Mixer", "HiFi Playback Switch", "DAC"},
|
{"Output Mixer", "HiFi Playback Switch", "DAC"},
|
||||||
|
@ -89,17 +89,6 @@ static const struct snd_soc_dapm_route intercon[] = {
|
||||||
{"LOUT", NULL, "Output Mixer"},
|
{"LOUT", NULL, "Output Mixer"},
|
||||||
};
|
};
|
||||||
|
|
||||||
static int wm8711_add_widgets(struct snd_soc_codec *codec)
|
|
||||||
{
|
|
||||||
struct snd_soc_dapm_context *dapm = &codec->dapm;
|
|
||||||
|
|
||||||
snd_soc_dapm_new_controls(dapm, wm8711_dapm_widgets,
|
|
||||||
ARRAY_SIZE(wm8711_dapm_widgets));
|
|
||||||
snd_soc_dapm_add_routes(dapm, intercon, ARRAY_SIZE(intercon));
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct _coeff_div {
|
struct _coeff_div {
|
||||||
u32 mclk;
|
u32 mclk;
|
||||||
u32 rate;
|
u32 rate;
|
||||||
|
@ -398,7 +387,6 @@ static int wm8711_probe(struct snd_soc_codec *codec)
|
||||||
|
|
||||||
snd_soc_add_controls(codec, wm8711_snd_controls,
|
snd_soc_add_controls(codec, wm8711_snd_controls,
|
||||||
ARRAY_SIZE(wm8711_snd_controls));
|
ARRAY_SIZE(wm8711_snd_controls));
|
||||||
wm8711_add_widgets(codec);
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
@ -420,6 +408,10 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8711 = {
|
||||||
.reg_cache_size = ARRAY_SIZE(wm8711_reg),
|
.reg_cache_size = ARRAY_SIZE(wm8711_reg),
|
||||||
.reg_word_size = sizeof(u16),
|
.reg_word_size = sizeof(u16),
|
||||||
.reg_cache_default = wm8711_reg,
|
.reg_cache_default = wm8711_reg,
|
||||||
|
.dapm_widgets = wm8711_dapm_widgets,
|
||||||
|
.num_dapm_widgets = ARRAY_SIZE(wm8711_dapm_widgets),
|
||||||
|
.dapm_routes = wm8711_intercon,
|
||||||
|
.num_dapm_routes = ARRAY_SIZE(wm8711_intercon),
|
||||||
};
|
};
|
||||||
|
|
||||||
#if defined(CONFIG_SPI_MASTER)
|
#if defined(CONFIG_SPI_MASTER)
|
||||||
|
|
Loading…
Reference in a new issue