Skip to content

L
linux
Commit c99f8b21 authored by Takashi Iwai's avatar Takashi Iwai Committed by Mark Brown
Browse files
Options

ASoC: da7213: Use SOC_ENUM_SINGLE_DECL() 

Just replace with the helper macro.  No functional change at all.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Acked-by: default avatarLiam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 38dbfb59
Show whitespace changes
Inline Side-by-side
Showing with 80 additions and 71 deletions
sound/soc/codecs/da7213.c
View file @ c99f8b21
...@@ -63,14 +63,14 @@ static const char * const da7213_voice_hpf_corner_txt[] = { ...@@ -63,14 +63,14 @@ static const char * const da7213_voice_hpf_corner_txt[] = {
"2.5Hz", "25Hz", "50Hz", "100Hz", "150Hz", "200Hz", "300Hz", "400Hz" "2.5Hz", "25Hz", "50Hz", "100Hz", "150Hz", "200Hz", "300Hz", "400Hz"
}; };
static const struct soc_enum da7213_dac_voice_hpf_corner = static SOC_ENUM_SINGLE_DECL(da7213_dac_voice_hpf_corner,
SOC_ENUM_SINGLE(DA7213_DAC_FILTERS1, DA7213_VOICE_HPF_CORNER_SHIFT, DA7213_DAC_FILTERS1,
DA7213_VOICE_HPF_CORNER_MAX, DA7213_VOICE_HPF_CORNER_SHIFT,
da7213_voice_hpf_corner_txt); da7213_voice_hpf_corner_txt);
static const struct soc_enum da7213_adc_voice_hpf_corner = static SOC_ENUM_SINGLE_DECL(da7213_adc_voice_hpf_corner,
SOC_ENUM_SINGLE(DA7213_ADC_FILTERS1, DA7213_VOICE_HPF_CORNER_SHIFT, DA7213_ADC_FILTERS1,
DA7213_VOICE_HPF_CORNER_MAX, DA7213_VOICE_HPF_CORNER_SHIFT,
da7213_voice_hpf_corner_txt); da7213_voice_hpf_corner_txt);
/* ADC and DAC high pass filter cutoff value */ /* ADC and DAC high pass filter cutoff value */
...@@ -78,14 +78,14 @@ static const char * const da7213_audio_hpf_corner_txt[] = { ...@@ -78,14 +78,14 @@ static const char * const da7213_audio_hpf_corner_txt[] = {
"Fs/24000", "Fs/12000", "Fs/6000", "Fs/3000" "Fs/24000", "Fs/12000", "Fs/6000", "Fs/3000"
}; };
static const struct soc_enum da7213_dac_audio_hpf_corner = static SOC_ENUM_SINGLE_DECL(da7213_dac_audio_hpf_corner,
SOC_ENUM_SINGLE(DA7213_DAC_FILTERS1, DA7213_AUDIO_HPF_CORNER_SHIFT, DA7213_DAC_FILTERS1
DA7213_AUDIO_HPF_CORNER_MAX, , DA7213_AUDIO_HPF_CORNER_SHIFT,
da7213_audio_hpf_corner_txt); da7213_audio_hpf_corner_txt);
static const struct soc_enum da7213_adc_audio_hpf_corner = static SOC_ENUM_SINGLE_DECL(da7213_adc_audio_hpf_corner,
SOC_ENUM_SINGLE(DA7213_ADC_FILTERS1, DA7213_AUDIO_HPF_CORNER_SHIFT, DA7213_ADC_FILTERS1,
DA7213_AUDIO_HPF_CORNER_MAX, DA7213_AUDIO_HPF_CORNER_SHIFT,
da7213_audio_hpf_corner_txt); da7213_audio_hpf_corner_txt);
/* Gain ramping rate value */ /* Gain ramping rate value */
...@@ -94,19 +94,19 @@ static const char * const da7213_gain_ramp_rate_txt[] = { ...@@ -94,19 +94,19 @@ static const char * const da7213_gain_ramp_rate_txt[] = {
"nominal rate / 32" "nominal rate / 32"
}; };
static const struct soc_enum da7213_gain_ramp_rate = static SOC_ENUM_SINGLE_DECL(da7213_gain_ramp_rate,
SOC_ENUM_SINGLE(DA7213_GAIN_RAMP_CTRL, DA7213_GAIN_RAMP_RATE_SHIFT, DA7213_GAIN_RAMP_CTRL,
DA7213_GAIN_RAMP_RATE_MAX, da7213_gain_ramp_rate_txt); DA7213_GAIN_RAMP_RATE_SHIFT,
da7213_gain_ramp_rate_txt);
/* DAC noise gate setup time value */ /* DAC noise gate setup time value */
static const char * const da7213_dac_ng_setup_time_txt[] = { static const char * const da7213_dac_ng_setup_time_txt[] = {
"256 samples", "512 samples", "1024 samples", "2048 samples" "256 samples", "512 samples", "1024 samples", "2048 samples"
}; };
static const struct soc_enum da7213_dac_ng_setup_time = static SOC_ENUM_SINGLE_DECL(da7213_dac_ng_setup_time,
SOC_ENUM_SINGLE(DA7213_DAC_NG_SETUP_TIME, DA7213_DAC_NG_SETUP_TIME,
DA7213_DAC_NG_SETUP_TIME_SHIFT, DA7213_DAC_NG_SETUP_TIME_SHIFT,
DA7213_DAC_NG_SETUP_TIME_MAX,
da7213_dac_ng_setup_time_txt); da7213_dac_ng_setup_time_txt);
/* DAC noise gate rampup rate value */ /* DAC noise gate rampup rate value */
...@@ -114,10 +114,9 @@ static const char * const da7213_dac_ng_rampup_txt[] = { ...@@ -114,10 +114,9 @@ static const char * const da7213_dac_ng_rampup_txt[] = {
"0.02 ms/dB", "0.16 ms/dB" "0.02 ms/dB", "0.16 ms/dB"
}; };
static const struct soc_enum da7213_dac_ng_rampup_rate = static SOC_ENUM_SINGLE_DECL(da7213_dac_ng_rampup_rate,
SOC_ENUM_SINGLE(DA7213_DAC_NG_SETUP_TIME, DA7213_DAC_NG_SETUP_TIME,
DA7213_DAC_NG_RAMPUP_RATE_SHIFT, DA7213_DAC_NG_RAMPUP_RATE_SHIFT,
DA7213_DAC_NG_RAMP_RATE_MAX,
da7213_dac_ng_rampup_txt); da7213_dac_ng_rampup_txt);
/* DAC noise gate rampdown rate value */ /* DAC noise gate rampdown rate value */
...@@ -125,10 +124,9 @@ static const char * const da7213_dac_ng_rampdown_txt[] = { ...@@ -125,10 +124,9 @@ static const char * const da7213_dac_ng_rampdown_txt[] = {
"0.64 ms/dB", "20.48 ms/dB" "0.64 ms/dB", "20.48 ms/dB"
}; };
static const struct soc_enum da7213_dac_ng_rampdown_rate = static SOC_ENUM_SINGLE_DECL(da7213_dac_ng_rampdown_rate,
SOC_ENUM_SINGLE(DA7213_DAC_NG_SETUP_TIME, DA7213_DAC_NG_SETUP_TIME,
DA7213_DAC_NG_RAMPDN_RATE_SHIFT, DA7213_DAC_NG_RAMPDN_RATE_SHIFT,
DA7213_DAC_NG_RAMP_RATE_MAX,
da7213_dac_ng_rampdown_txt); da7213_dac_ng_rampdown_txt);
/* DAC soft mute rate value */ /* DAC soft mute rate value */
...@@ -136,9 +134,9 @@ static const char * const da7213_dac_soft_mute_rate_txt[] = { ...@@ -136,9 +134,9 @@ static const char * const da7213_dac_soft_mute_rate_txt[] = {
"1", "2", "4", "8", "16", "32", "64" "1", "2", "4", "8", "16", "32", "64"
}; };
static const struct soc_enum da7213_dac_soft_mute_rate = static SOC_ENUM_SINGLE_DECL(da7213_dac_soft_mute_rate,
SOC_ENUM_SINGLE(DA7213_DAC_FILTERS5, DA7213_DAC_SOFTMUTE_RATE_SHIFT, DA7213_DAC_FILTERS5,
DA7213_DAC_SOFTMUTE_RATE_MAX, DA7213_DAC_SOFTMUTE_RATE_SHIFT,
da7213_dac_soft_mute_rate_txt); da7213_dac_soft_mute_rate_txt);
/* ALC Attack Rate select */ /* ALC Attack Rate select */
...@@ -147,9 +145,10 @@ static const char * const da7213_alc_attack_rate_txt[] = { ...@@ -147,9 +145,10 @@ static const char * const da7213_alc_attack_rate_txt[] = {
"5632/fs", "11264/fs", "22528/fs", "45056/fs", "90112/fs", "180224/fs" "5632/fs", "11264/fs", "22528/fs", "45056/fs", "90112/fs", "180224/fs"
}; };
static const struct soc_enum da7213_alc_attack_rate = static SOC_ENUM_SINGLE_DECL(da7213_alc_attack_rate,
SOC_ENUM_SINGLE(DA7213_ALC_CTRL2, DA7213_ALC_ATTACK_SHIFT, DA7213_ALC_CTRL2,
DA7213_ALC_ATTACK_MAX, da7213_alc_attack_rate_txt); DA7213_ALC_ATTACK_SHIFT,
da7213_alc_attack_rate_txt);
/* ALC Release Rate select */ /* ALC Release Rate select */
static const char * const da7213_alc_release_rate_txt[] = { static const char * const da7213_alc_release_rate_txt[] = {
...@@ -157,9 +156,10 @@ static const char * const da7213_alc_release_rate_txt[] = { ...@@ -157,9 +156,10 @@ static const char * const da7213_alc_release_rate_txt[] = {
"11264/fs", "22528/fs", "45056/fs", "90112/fs", "180224/fs" "11264/fs", "22528/fs", "45056/fs", "90112/fs", "180224/fs"
}; };
static const struct soc_enum da7213_alc_release_rate = static SOC_ENUM_SINGLE_DECL(da7213_alc_release_rate,
SOC_ENUM_SINGLE(DA7213_ALC_CTRL2, DA7213_ALC_RELEASE_SHIFT, DA7213_ALC_CTRL2,
DA7213_ALC_RELEASE_MAX, da7213_alc_release_rate_txt); DA7213_ALC_RELEASE_SHIFT,
da7213_alc_release_rate_txt);
/* ALC Hold Time select */ /* ALC Hold Time select */
static const char * const da7213_alc_hold_time_txt[] = { static const char * const da7213_alc_hold_time_txt[] = {
...@@ -168,22 +168,25 @@ static const char * const da7213_alc_hold_time_txt[] = { ...@@ -168,22 +168,25 @@ static const char * const da7213_alc_hold_time_txt[] = {
"253952/fs", "507904/fs", "1015808/fs", "2031616/fs" "253952/fs", "507904/fs", "1015808/fs", "2031616/fs"
}; };
static const struct soc_enum da7213_alc_hold_time = static SOC_ENUM_SINGLE_DECL(da7213_alc_hold_time,
SOC_ENUM_SINGLE(DA7213_ALC_CTRL3, DA7213_ALC_HOLD_SHIFT, DA7213_ALC_CTRL3,
DA7213_ALC_HOLD_MAX, da7213_alc_hold_time_txt); DA7213_ALC_HOLD_SHIFT,
da7213_alc_hold_time_txt);
/* ALC Input Signal Tracking rate select */ /* ALC Input Signal Tracking rate select */
static const char * const da7213_alc_integ_rate_txt[] = { static const char * const da7213_alc_integ_rate_txt[] = {
"1/4", "1/16", "1/256", "1/65536" "1/4", "1/16", "1/256", "1/65536"
}; };
static const struct soc_enum da7213_alc_integ_attack_rate = static SOC_ENUM_SINGLE_DECL(da7213_alc_integ_attack_rate,
SOC_ENUM_SINGLE(DA7213_ALC_CTRL3, DA7213_ALC_INTEG_ATTACK_SHIFT, DA7213_ALC_CTRL3,
DA7213_ALC_INTEG_MAX, da7213_alc_integ_rate_txt); DA7213_ALC_INTEG_ATTACK_SHIFT,
da7213_alc_integ_rate_txt);
static const struct soc_enum da7213_alc_integ_release_rate = static SOC_ENUM_SINGLE_DECL(da7213_alc_integ_release_rate,
SOC_ENUM_SINGLE(DA7213_ALC_CTRL3, DA7213_ALC_INTEG_RELEASE_SHIFT, DA7213_ALC_CTRL3,
DA7213_ALC_INTEG_MAX, da7213_alc_integ_rate_txt); DA7213_ALC_INTEG_RELEASE_SHIFT,
da7213_alc_integ_rate_txt);
/* /*
...@@ -584,15 +587,17 @@ static const char * const da7213_mic_amp_in_sel_txt[] = { ...@@ -584,15 +587,17 @@ static const char * const da7213_mic_amp_in_sel_txt[] = {
"Differential", "MIC_P", "MIC_N" "Differential", "MIC_P", "MIC_N"
}; };
static const struct soc_enum da7213_mic_1_amp_in_sel = static SOC_ENUM_SINGLE_DECL(da7213_mic_1_amp_in_sel,
SOC_ENUM_SINGLE(DA7213_MIC_1_CTRL, DA7213_MIC_AMP_IN_SEL_SHIFT, DA7213_MIC_1_CTRL,
DA7213_MIC_AMP_IN_SEL_MAX, da7213_mic_amp_in_sel_txt); DA7213_MIC_AMP_IN_SEL_SHIFT,
da7213_mic_amp_in_sel_txt);
static const struct snd_kcontrol_new da7213_mic_1_amp_in_sel_mux = static const struct snd_kcontrol_new da7213_mic_1_amp_in_sel_mux =
SOC_DAPM_ENUM("Mic 1 Amp Source MUX", da7213_mic_1_amp_in_sel); SOC_DAPM_ENUM("Mic 1 Amp Source MUX", da7213_mic_1_amp_in_sel);
static const struct soc_enum da7213_mic_2_amp_in_sel = static SOC_ENUM_SINGLE_DECL(da7213_mic_2_amp_in_sel,
SOC_ENUM_SINGLE(DA7213_MIC_2_CTRL, DA7213_MIC_AMP_IN_SEL_SHIFT, DA7213_MIC_2_CTRL,
DA7213_MIC_AMP_IN_SEL_MAX, da7213_mic_amp_in_sel_txt); DA7213_MIC_AMP_IN_SEL_SHIFT,
da7213_mic_amp_in_sel_txt);
static const struct snd_kcontrol_new da7213_mic_2_amp_in_sel_mux = static const struct snd_kcontrol_new da7213_mic_2_amp_in_sel_mux =
SOC_DAPM_ENUM("Mic 2 Amp Source MUX", da7213_mic_2_amp_in_sel); SOC_DAPM_ENUM("Mic 2 Amp Source MUX", da7213_mic_2_amp_in_sel);
...@@ -601,15 +606,17 @@ static const char * const da7213_dai_src_txt[] = { ...@@ -601,15 +606,17 @@ static const char * const da7213_dai_src_txt[] = {
"ADC Left", "ADC Right", "DAI Input Left", "DAI Input Right" "ADC Left", "ADC Right", "DAI Input Left", "DAI Input Right"
}; };
static const struct soc_enum da7213_dai_l_src = static SOC_ENUM_SINGLE_DECL(da7213_dai_l_src,
SOC_ENUM_SINGLE(DA7213_DIG_ROUTING_DAI, DA7213_DAI_L_SRC_SHIFT, DA7213_DIG_ROUTING_DAI,
DA7213_DAI_SRC_MAX, da7213_dai_src_txt); DA7213_DAI_L_SRC_SHIFT,
da7213_dai_src_txt);
static const struct snd_kcontrol_new da7213_dai_l_src_mux = static const struct snd_kcontrol_new da7213_dai_l_src_mux =
SOC_DAPM_ENUM("DAI Left Source MUX", da7213_dai_l_src); SOC_DAPM_ENUM("DAI Left Source MUX", da7213_dai_l_src);
static const struct soc_enum da7213_dai_r_src = static SOC_ENUM_SINGLE_DECL(da7213_dai_r_src,
SOC_ENUM_SINGLE(DA7213_DIG_ROUTING_DAI, DA7213_DAI_R_SRC_SHIFT, DA7213_DIG_ROUTING_DAI,
DA7213_DAI_SRC_MAX, da7213_dai_src_txt); DA7213_DAI_R_SRC_SHIFT,
da7213_dai_src_txt);
static const struct snd_kcontrol_new da7213_dai_r_src_mux = static const struct snd_kcontrol_new da7213_dai_r_src_mux =
SOC_DAPM_ENUM("DAI Right Source MUX", da7213_dai_r_src); SOC_DAPM_ENUM("DAI Right Source MUX", da7213_dai_r_src);
...@@ -619,15 +626,17 @@ static const char * const da7213_dac_src_txt[] = { ...@@ -619,15 +626,17 @@ static const char * const da7213_dac_src_txt[] = {
"DAI Input Right" "DAI Input Right"
}; };
static const struct soc_enum da7213_dac_l_src = static SOC_ENUM_SINGLE_DECL(da7213_dac_l_src,
SOC_ENUM_SINGLE(DA7213_DIG_ROUTING_DAC, DA7213_DAC_L_SRC_SHIFT, DA7213_DIG_ROUTING_DAC,
DA7213_DAC_SRC_MAX, da7213_dac_src_txt); DA7213_DAC_L_SRC_SHIFT,
da7213_dac_src_txt);
static const struct snd_kcontrol_new da7213_dac_l_src_mux = static const struct snd_kcontrol_new da7213_dac_l_src_mux =
SOC_DAPM_ENUM("DAC Left Source MUX", da7213_dac_l_src); SOC_DAPM_ENUM("DAC Left Source MUX", da7213_dac_l_src);
static const struct soc_enum da7213_dac_r_src = static SOC_ENUM_SINGLE_DECL(da7213_dac_r_src,
SOC_ENUM_SINGLE(DA7213_DIG_ROUTING_DAC, DA7213_DAC_R_SRC_SHIFT, DA7213_DIG_ROUTING_DAC,
DA7213_DAC_SRC_MAX, da7213_dac_src_txt); DA7213_DAC_R_SRC_SHIFT,
da7213_dac_src_txt);
static const struct snd_kcontrol_new da7213_dac_r_src_mux = static const struct snd_kcontrol_new da7213_dac_r_src_mux =
SOC_DAPM_ENUM("DAC Right Source MUX", da7213_dac_r_src); SOC_DAPM_ENUM("DAC Right Source MUX", da7213_dac_r_src);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7