|
@@ -157,26 +157,23 @@ static int wm899x_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol,
|
|
|
static const char *wm8990_digital_sidetone[] =
|
|
|
{"None", "Left ADC", "Right ADC", "Reserved"};
|
|
|
|
|
|
-static const struct soc_enum wm8990_left_digital_sidetone_enum =
|
|
|
-SOC_ENUM_SINGLE(WM8990_DIGITAL_SIDE_TONE,
|
|
|
- WM8990_ADC_TO_DACL_SHIFT,
|
|
|
- WM8990_ADC_TO_DACL_MASK,
|
|
|
- wm8990_digital_sidetone);
|
|
|
-
|
|
|
-static const struct soc_enum wm8990_right_digital_sidetone_enum =
|
|
|
-SOC_ENUM_SINGLE(WM8990_DIGITAL_SIDE_TONE,
|
|
|
- WM8990_ADC_TO_DACR_SHIFT,
|
|
|
- WM8990_ADC_TO_DACR_MASK,
|
|
|
- wm8990_digital_sidetone);
|
|
|
+static SOC_ENUM_SINGLE_DECL(wm8990_left_digital_sidetone_enum,
|
|
|
+ WM8990_DIGITAL_SIDE_TONE,
|
|
|
+ WM8990_ADC_TO_DACL_SHIFT,
|
|
|
+ wm8990_digital_sidetone);
|
|
|
+
|
|
|
+static SOC_ENUM_SINGLE_DECL(wm8990_right_digital_sidetone_enum,
|
|
|
+ WM8990_DIGITAL_SIDE_TONE,
|
|
|
+ WM8990_ADC_TO_DACR_SHIFT,
|
|
|
+ wm8990_digital_sidetone);
|
|
|
|
|
|
static const char *wm8990_adcmode[] =
|
|
|
{"Hi-fi mode", "Voice mode 1", "Voice mode 2", "Voice mode 3"};
|
|
|
|
|
|
-static const struct soc_enum wm8990_right_adcmode_enum =
|
|
|
-SOC_ENUM_SINGLE(WM8990_ADC_CTRL,
|
|
|
- WM8990_ADC_HPF_CUT_SHIFT,
|
|
|
- WM8990_ADC_HPF_CUT_MASK,
|
|
|
- wm8990_adcmode);
|
|
|
+static SOC_ENUM_SINGLE_DECL(wm8990_right_adcmode_enum,
|
|
|
+ WM8990_ADC_CTRL,
|
|
|
+ WM8990_ADC_HPF_CUT_SHIFT,
|
|
|
+ wm8990_adcmode);
|
|
|
|
|
|
static const struct snd_kcontrol_new wm8990_snd_controls[] = {
|
|
|
/* INMIXL */
|
|
@@ -475,9 +472,9 @@ SOC_DAPM_SINGLE("RINPGA34 Switch", WM8990_INPUT_MIXER3, WM8990_L34MNB_BIT,
|
|
|
static const char *wm8990_ainlmux[] =
|
|
|
{"INMIXL Mix", "RXVOICE Mix", "DIFFINL Mix"};
|
|
|
|
|
|
-static const struct soc_enum wm8990_ainlmux_enum =
|
|
|
-SOC_ENUM_SINGLE(WM8990_INPUT_MIXER1, WM8990_AINLMODE_SHIFT,
|
|
|
- ARRAY_SIZE(wm8990_ainlmux), wm8990_ainlmux);
|
|
|
+static SOC_ENUM_SINGLE_DECL(wm8990_ainlmux_enum,
|
|
|
+ WM8990_INPUT_MIXER1, WM8990_AINLMODE_SHIFT,
|
|
|
+ wm8990_ainlmux);
|
|
|
|
|
|
static const struct snd_kcontrol_new wm8990_dapm_ainlmux_controls =
|
|
|
SOC_DAPM_ENUM("Route", wm8990_ainlmux_enum);
|
|
@@ -488,9 +485,9 @@ SOC_DAPM_ENUM("Route", wm8990_ainlmux_enum);
|
|
|
static const char *wm8990_ainrmux[] =
|
|
|
{"INMIXR Mix", "RXVOICE Mix", "DIFFINR Mix"};
|
|
|
|
|
|
-static const struct soc_enum wm8990_ainrmux_enum =
|
|
|
-SOC_ENUM_SINGLE(WM8990_INPUT_MIXER1, WM8990_AINRMODE_SHIFT,
|
|
|
- ARRAY_SIZE(wm8990_ainrmux), wm8990_ainrmux);
|
|
|
+static SOC_ENUM_SINGLE_DECL(wm8990_ainrmux_enum,
|
|
|
+ WM8990_INPUT_MIXER1, WM8990_AINRMODE_SHIFT,
|
|
|
+ wm8990_ainrmux);
|
|
|
|
|
|
static const struct snd_kcontrol_new wm8990_dapm_ainrmux_controls =
|
|
|
SOC_DAPM_ENUM("Route", wm8990_ainrmux_enum);
|