Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b13a054a authored by Takashi Iwai's avatar Takashi Iwai Committed by Mark Brown
Browse files

ASoC: wm8988: 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 avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent b57efda1

sound/soc/codecs/wm8988.c

+24 −24
Original line number Original line Diff line number Diff line
@@ -126,46 +126,46 @@ struct wm8988_priv { 
 */

 */





static const char *bass_boost_txt[] = {"Linear Control", "Adaptive Boost"};

static const char *bass_boost_txt[] = {"Linear Control", "Adaptive Boost"};

static const struct soc_enum bass_boost =

static SOC_ENUM_SINGLE_DECL(bass_boost,

	SOC_ENUM_SINGLE(WM8988_BASS, 7, 2, bass_boost_txt);

			    WM8988_BASS, 7, bass_boost_txt);





static const char *bass_filter_txt[] = { "130Hz @ 48kHz", "200Hz @ 48kHz" };

static const char *bass_filter_txt[] = { "130Hz @ 48kHz", "200Hz @ 48kHz" };

static const struct soc_enum bass_filter =

static SOC_ENUM_SINGLE_DECL(bass_filter,

	SOC_ENUM_SINGLE(WM8988_BASS, 6, 2, bass_filter_txt);

			    WM8988_BASS, 6, bass_filter_txt);





static const char *treble_txt[] = {"8kHz", "4kHz"};

static const char *treble_txt[] = {"8kHz", "4kHz"};

static const struct soc_enum treble =

static SOC_ENUM_SINGLE_DECL(treble,

	SOC_ENUM_SINGLE(WM8988_TREBLE, 6, 2, treble_txt);

			    WM8988_TREBLE, 6, treble_txt);





static const char *stereo_3d_lc_txt[] = {"200Hz", "500Hz"};

static const char *stereo_3d_lc_txt[] = {"200Hz", "500Hz"};

static const struct soc_enum stereo_3d_lc =

static SOC_ENUM_SINGLE_DECL(stereo_3d_lc,

	SOC_ENUM_SINGLE(WM8988_3D, 5, 2, stereo_3d_lc_txt);

			    WM8988_3D, 5, stereo_3d_lc_txt);





static const char *stereo_3d_uc_txt[] = {"2.2kHz", "1.5kHz"};

static const char *stereo_3d_uc_txt[] = {"2.2kHz", "1.5kHz"};

static const struct soc_enum stereo_3d_uc =

static SOC_ENUM_SINGLE_DECL(stereo_3d_uc,

	SOC_ENUM_SINGLE(WM8988_3D, 6, 2, stereo_3d_uc_txt);

			    WM8988_3D, 6, stereo_3d_uc_txt);





static const char *stereo_3d_func_txt[] = {"Capture", "Playback"};

static const char *stereo_3d_func_txt[] = {"Capture", "Playback"};

static const struct soc_enum stereo_3d_func =

static SOC_ENUM_SINGLE_DECL(stereo_3d_func,

	SOC_ENUM_SINGLE(WM8988_3D, 7, 2, stereo_3d_func_txt);

			    WM8988_3D, 7, stereo_3d_func_txt);





static const char *alc_func_txt[] = {"Off", "Right", "Left", "Stereo"};

static const char *alc_func_txt[] = {"Off", "Right", "Left", "Stereo"};

static const struct soc_enum alc_func =

static SOC_ENUM_SINGLE_DECL(alc_func,

	SOC_ENUM_SINGLE(WM8988_ALC1, 7, 4, alc_func_txt);

			    WM8988_ALC1, 7, alc_func_txt);





static const char *ng_type_txt[] = {"Constant PGA Gain",

static const char *ng_type_txt[] = {"Constant PGA Gain",

				    "Mute ADC Output"};

				    "Mute ADC Output"};

static const struct soc_enum ng_type =

static SOC_ENUM_SINGLE_DECL(ng_type,

	SOC_ENUM_SINGLE(WM8988_NGATE, 1, 2, ng_type_txt);

			    WM8988_NGATE, 1, ng_type_txt);





static const char *deemph_txt[] = {"None", "32Khz", "44.1Khz", "48Khz"};

static const char *deemph_txt[] = {"None", "32Khz", "44.1Khz", "48Khz"};

static const struct soc_enum deemph =

static SOC_ENUM_SINGLE_DECL(deemph,

	SOC_ENUM_SINGLE(WM8988_ADCDAC, 1, 4, deemph_txt);

			    WM8988_ADCDAC, 1, deemph_txt);





static const char *adcpol_txt[] = {"Normal", "L Invert", "R Invert",

static const char *adcpol_txt[] = {"Normal", "L Invert", "R Invert",

				   "L + R Invert"};

				   "L + R Invert"};

static const struct soc_enum adcpol =

static SOC_ENUM_SINGLE_DECL(adcpol,

	SOC_ENUM_SINGLE(WM8988_ADCDAC, 5, 4, adcpol_txt);

			    WM8988_ADCDAC, 5, adcpol_txt);





static const DECLARE_TLV_DB_SCALE(pga_tlv, -1725, 75, 0);

static const DECLARE_TLV_DB_SCALE(pga_tlv, -1725, 75, 0);

static const DECLARE_TLV_DB_SCALE(adc_tlv, -9750, 50, 1);

static const DECLARE_TLV_DB_SCALE(adc_tlv, -9750, 50, 1);
@@ -317,16 +317,16 @@ static const struct snd_kcontrol_new wm8988_right_pga_controls = 




/* Differential Mux */

/* Differential Mux */

static const char *wm8988_diff_sel[] = {"Line 1", "Line 2"};

static const char *wm8988_diff_sel[] = {"Line 1", "Line 2"};

static const struct soc_enum diffmux =

static SOC_ENUM_SINGLE_DECL(diffmux,

	SOC_ENUM_SINGLE(WM8988_ADCIN, 8, 2, wm8988_diff_sel);

			    WM8988_ADCIN, 8, wm8988_diff_sel);

static const struct snd_kcontrol_new wm8988_diffmux_controls =

static const struct snd_kcontrol_new wm8988_diffmux_controls =

	SOC_DAPM_ENUM("Route", diffmux);

	SOC_DAPM_ENUM("Route", diffmux);





/* Mono ADC Mux */

/* Mono ADC Mux */

static const char *wm8988_mono_mux[] = {"Stereo", "Mono (Left)",

static const char *wm8988_mono_mux[] = {"Stereo", "Mono (Left)",

	"Mono (Right)", "Digital Mono"};

	"Mono (Right)", "Digital Mono"};

static const struct soc_enum monomux =

static SOC_ENUM_SINGLE_DECL(monomux,

	SOC_ENUM_SINGLE(WM8988_ADCIN, 6, 4, wm8988_mono_mux);

			    WM8988_ADCIN, 6, wm8988_mono_mux);

static const struct snd_kcontrol_new wm8988_monomux_controls =

static const struct snd_kcontrol_new wm8988_monomux_controls =

	SOC_DAPM_ENUM("Route", monomux);

	SOC_DAPM_ENUM("Route", monomux);