diff options
| -rw-r--r-- | sound/soc/codecs/wm8940.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c index b404c26c1753..87f032d0d19f 100644 --- a/sound/soc/codecs/wm8940.c +++ b/sound/soc/codecs/wm8940.c | |||
| @@ -154,22 +154,22 @@ static const struct reg_default wm8940_reg_defaults[] = { | |||
| 154 | }; | 154 | }; |
| 155 | 155 | ||
| 156 | static const char *wm8940_companding[] = { "Off", "NC", "u-law", "A-law" }; | 156 | static const char *wm8940_companding[] = { "Off", "NC", "u-law", "A-law" }; |
| 157 | static const struct soc_enum wm8940_adc_companding_enum | 157 | static SOC_ENUM_SINGLE_DECL(wm8940_adc_companding_enum, |
| 158 | = SOC_ENUM_SINGLE(WM8940_COMPANDINGCTL, 1, 4, wm8940_companding); | 158 | WM8940_COMPANDINGCTL, 1, wm8940_companding); |
| 159 | static const struct soc_enum wm8940_dac_companding_enum | 159 | static SOC_ENUM_SINGLE_DECL(wm8940_dac_companding_enum, |
| 160 | = SOC_ENUM_SINGLE(WM8940_COMPANDINGCTL, 3, 4, wm8940_companding); | 160 | WM8940_COMPANDINGCTL, 3, wm8940_companding); |
| 161 | 161 | ||
| 162 | static const char *wm8940_alc_mode_text[] = {"ALC", "Limiter"}; | 162 | static const char *wm8940_alc_mode_text[] = {"ALC", "Limiter"}; |
| 163 | static const struct soc_enum wm8940_alc_mode_enum | 163 | static SOC_ENUM_SINGLE_DECL(wm8940_alc_mode_enum, |
| 164 | = SOC_ENUM_SINGLE(WM8940_ALC3, 8, 2, wm8940_alc_mode_text); | 164 | WM8940_ALC3, 8, wm8940_alc_mode_text); |
| 165 | 165 | ||
| 166 | static const char *wm8940_mic_bias_level_text[] = {"0.9", "0.65"}; | 166 | static const char *wm8940_mic_bias_level_text[] = {"0.9", "0.65"}; |
| 167 | static const struct soc_enum wm8940_mic_bias_level_enum | 167 | static SOC_ENUM_SINGLE_DECL(wm8940_mic_bias_level_enum, |
| 168 | = SOC_ENUM_SINGLE(WM8940_INPUTCTL, 8, 2, wm8940_mic_bias_level_text); | 168 | WM8940_INPUTCTL, 8, wm8940_mic_bias_level_text); |
| 169 | 169 | ||
| 170 | static const char *wm8940_filter_mode_text[] = {"Audio", "Application"}; | 170 | static const char *wm8940_filter_mode_text[] = {"Audio", "Application"}; |
| 171 | static const struct soc_enum wm8940_filter_mode_enum | 171 | static SOC_ENUM_SINGLE_DECL(wm8940_filter_mode_enum, |
| 172 | = SOC_ENUM_SINGLE(WM8940_ADC, 7, 2, wm8940_filter_mode_text); | 172 | WM8940_ADC, 7, wm8940_filter_mode_text); |
| 173 | 173 | ||
| 174 | static DECLARE_TLV_DB_SCALE(wm8940_spk_vol_tlv, -5700, 100, 1); | 174 | static DECLARE_TLV_DB_SCALE(wm8940_spk_vol_tlv, -5700, 100, 1); |
| 175 | static DECLARE_TLV_DB_SCALE(wm8940_att_tlv, -1000, 1000, 0); | 175 | static DECLARE_TLV_DB_SCALE(wm8940_att_tlv, -1000, 1000, 0); |
