ASoC: Convert uda1380 to table based DAPM and control init
Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
5ee65ec628
commit
58fa8e456c
1 changed files with 8 additions and 16 deletions
|
@ -373,7 +373,7 @@ static const struct snd_soc_dapm_widget uda1380_dapm_widgets[] = {
|
||||||
SND_SOC_DAPM_PGA("HeadPhone Driver", UDA1380_PM, 13, 0, NULL, 0),
|
SND_SOC_DAPM_PGA("HeadPhone Driver", UDA1380_PM, 13, 0, NULL, 0),
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct snd_soc_dapm_route audio_map[] = {
|
static const struct snd_soc_dapm_route uda1380_dapm_routes[] = {
|
||||||
|
|
||||||
/* output mux */
|
/* output mux */
|
||||||
{"HeadPhone Driver", NULL, "Output Mux"},
|
{"HeadPhone Driver", NULL, "Output Mux"},
|
||||||
|
@ -410,17 +410,6 @@ static const struct snd_soc_dapm_route audio_map[] = {
|
||||||
{"Right PGA", NULL, "VINR"},
|
{"Right PGA", NULL, "VINR"},
|
||||||
};
|
};
|
||||||
|
|
||||||
static int uda1380_add_widgets(struct snd_soc_codec *codec)
|
|
||||||
{
|
|
||||||
struct snd_soc_dapm_context *dapm = &codec->dapm;
|
|
||||||
|
|
||||||
snd_soc_dapm_new_controls(dapm, uda1380_dapm_widgets,
|
|
||||||
ARRAY_SIZE(uda1380_dapm_widgets));
|
|
||||||
snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int uda1380_set_dai_fmt_both(struct snd_soc_dai *codec_dai,
|
static int uda1380_set_dai_fmt_both(struct snd_soc_dai *codec_dai,
|
||||||
unsigned int fmt)
|
unsigned int fmt)
|
||||||
{
|
{
|
||||||
|
@ -764,10 +753,6 @@ static int uda1380_probe(struct snd_soc_codec *codec)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
snd_soc_add_controls(codec, uda1380_snd_controls,
|
|
||||||
ARRAY_SIZE(uda1380_snd_controls));
|
|
||||||
uda1380_add_widgets(codec);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
err_free_gpio:
|
err_free_gpio:
|
||||||
|
@ -802,6 +787,13 @@ static struct snd_soc_codec_driver soc_codec_dev_uda1380 = {
|
||||||
.reg_word_size = sizeof(u16),
|
.reg_word_size = sizeof(u16),
|
||||||
.reg_cache_default = uda1380_reg,
|
.reg_cache_default = uda1380_reg,
|
||||||
.reg_cache_step = 1,
|
.reg_cache_step = 1,
|
||||||
|
|
||||||
|
.controls = uda1380_snd_controls,
|
||||||
|
.num_controls = ARRAY_SIZE(uda1380_snd_controls),
|
||||||
|
.dapm_widgets = uda1380_dapm_widgets,
|
||||||
|
.num_dapm_widgets = ARRAY_SIZE(uda1380_dapm_widgets),
|
||||||
|
.dapm_routes = uda1380_dapm_routes,
|
||||||
|
.num_dapm_routes = ARRAY_SIZE(uda1380_dapm_routes),
|
||||||
};
|
};
|
||||||
|
|
||||||
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
|
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
|
||||||
|
|
Reference in a new issue