Commit a0628934 authored by Takashi Iwai's avatar Takashi Iwai Committed by Mark Brown

ASoC: max98088: Use SOC_*_ENUM_SINGLE_DECL()

Just replace with the helper macros.  No functional change at all.
Acked-by: default avatarLiam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 38dbfb59
...@@ -597,28 +597,27 @@ static const unsigned int max98088_exmode_values[] = { ...@@ -597,28 +597,27 @@ static const unsigned int max98088_exmode_values[] = {
0x00, 0x43, 0x10, 0x20, 0x30, 0x40, 0x11, 0x22, 0x32 0x00, 0x43, 0x10, 0x20, 0x30, 0x40, 0x11, 0x22, 0x32
}; };
static const struct soc_enum max98088_exmode_enum = static SOC_VALUE_ENUM_SINGLE_DECL(max98088_exmode_enum,
SOC_VALUE_ENUM_SINGLE(M98088_REG_41_SPKDHP, 0, 127, M98088_REG_41_SPKDHP, 0, 127,
ARRAY_SIZE(max98088_exmode_texts), max98088_exmode_texts,
max98088_exmode_texts, max98088_exmode_values);
max98088_exmode_values);
static const char *max98088_ex_thresh[] = { /* volts PP */ static const char *max98088_ex_thresh[] = { /* volts PP */
"0.6", "1.2", "1.8", "2.4", "3.0", "3.6", "4.2", "4.8"}; "0.6", "1.2", "1.8", "2.4", "3.0", "3.6", "4.2", "4.8"};
static const struct soc_enum max98088_ex_thresh_enum[] = { static SOC_ENUM_SINGLE_DECL(max98088_ex_thresh_enum,
SOC_ENUM_SINGLE(M98088_REG_42_SPKDHP_THRESH, 0, 8, M98088_REG_42_SPKDHP_THRESH, 0,
max98088_ex_thresh), max98088_ex_thresh);
};
static const char *max98088_fltr_mode[] = {"Voice", "Music" }; static const char *max98088_fltr_mode[] = {"Voice", "Music" };
static const struct soc_enum max98088_filter_mode_enum[] = { static SOC_ENUM_SINGLE_DECL(max98088_filter_mode_enum,
SOC_ENUM_SINGLE(M98088_REG_18_DAI1_FILTERS, 7, 2, max98088_fltr_mode), M98088_REG_18_DAI1_FILTERS, 7,
}; max98088_fltr_mode);
static const char *max98088_extmic_text[] = { "None", "MIC1", "MIC2" }; static const char *max98088_extmic_text[] = { "None", "MIC1", "MIC2" };
static const struct soc_enum max98088_extmic_enum = static SOC_ENUM_SINGLE_DECL(max98088_extmic_enum,
SOC_ENUM_SINGLE(M98088_REG_48_CFG_MIC, 0, 3, max98088_extmic_text); M98088_REG_48_CFG_MIC, 0,
max98088_extmic_text);
static const struct snd_kcontrol_new max98088_extmic_mux = static const struct snd_kcontrol_new max98088_extmic_mux =
SOC_DAPM_ENUM("External MIC Mux", max98088_extmic_enum); SOC_DAPM_ENUM("External MIC Mux", max98088_extmic_enum);
...@@ -626,12 +625,12 @@ static const struct snd_kcontrol_new max98088_extmic_mux = ...@@ -626,12 +625,12 @@ static const struct snd_kcontrol_new max98088_extmic_mux =
static const char *max98088_dai1_fltr[] = { static const char *max98088_dai1_fltr[] = {
"Off", "fc=258/fs=16k", "fc=500/fs=16k", "Off", "fc=258/fs=16k", "fc=500/fs=16k",
"fc=258/fs=8k", "fc=500/fs=8k", "fc=200"}; "fc=258/fs=8k", "fc=500/fs=8k", "fc=200"};
static const struct soc_enum max98088_dai1_dac_filter_enum[] = { static SOC_ENUM_SINGLE_DECL(max98088_dai1_dac_filter_enum,
SOC_ENUM_SINGLE(M98088_REG_18_DAI1_FILTERS, 0, 6, max98088_dai1_fltr), M98088_REG_18_DAI1_FILTERS, 0,
}; max98088_dai1_fltr);
static const struct soc_enum max98088_dai1_adc_filter_enum[] = { static SOC_ENUM_SINGLE_DECL(max98088_dai1_adc_filter_enum,
SOC_ENUM_SINGLE(M98088_REG_18_DAI1_FILTERS, 4, 6, max98088_dai1_fltr), M98088_REG_18_DAI1_FILTERS, 4,
}; max98088_dai1_fltr);
static int max98088_mic1pre_set(struct snd_kcontrol *kcontrol, static int max98088_mic1pre_set(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment