diff options
Diffstat (limited to 'sound/soc/codecs/lm49453.c')
-rw-r--r-- | sound/soc/codecs/lm49453.c | 47 |
1 files changed, 14 insertions, 33 deletions
diff --git a/sound/soc/codecs/lm49453.c b/sound/soc/codecs/lm49453.c index e19490cfb3a8..275b3f72f3f4 100644 --- a/sound/soc/codecs/lm49453.c +++ b/sound/soc/codecs/lm49453.c | |||
@@ -195,33 +195,31 @@ struct lm49453_priv { | |||
195 | 195 | ||
196 | static const char *lm49453_mic2mode_text[] = {"Single Ended", "Differential"}; | 196 | static const char *lm49453_mic2mode_text[] = {"Single Ended", "Differential"}; |
197 | 197 | ||
198 | static const SOC_ENUM_SINGLE_DECL(lm49453_mic2mode_enum, LM49453_P0_MICR_REG, 5, | 198 | static SOC_ENUM_SINGLE_DECL(lm49453_mic2mode_enum, LM49453_P0_MICR_REG, 5, |
199 | lm49453_mic2mode_text); | 199 | lm49453_mic2mode_text); |
200 | 200 | ||
201 | static const char *lm49453_dmic_cfg_text[] = {"DMICDAT1", "DMICDAT2"}; | 201 | static const char *lm49453_dmic_cfg_text[] = {"DMICDAT1", "DMICDAT2"}; |
202 | 202 | ||
203 | static const SOC_ENUM_SINGLE_DECL(lm49453_dmic12_cfg_enum, | 203 | static SOC_ENUM_SINGLE_DECL(lm49453_dmic12_cfg_enum, |
204 | LM49453_P0_DIGITAL_MIC1_CONFIG_REG, | 204 | LM49453_P0_DIGITAL_MIC1_CONFIG_REG, 7, |
205 | 7, lm49453_dmic_cfg_text); | 205 | lm49453_dmic_cfg_text); |
206 | 206 | ||
207 | static const SOC_ENUM_SINGLE_DECL(lm49453_dmic34_cfg_enum, | 207 | static SOC_ENUM_SINGLE_DECL(lm49453_dmic34_cfg_enum, |
208 | LM49453_P0_DIGITAL_MIC2_CONFIG_REG, | 208 | LM49453_P0_DIGITAL_MIC2_CONFIG_REG, 7, |
209 | 7, lm49453_dmic_cfg_text); | 209 | lm49453_dmic_cfg_text); |
210 | 210 | ||
211 | /* MUX Controls */ | 211 | /* MUX Controls */ |
212 | static const char *lm49453_adcl_mux_text[] = { "MIC1", "Aux_L" }; | 212 | static const char *lm49453_adcl_mux_text[] = { "MIC1", "Aux_L" }; |
213 | 213 | ||
214 | static const char *lm49453_adcr_mux_text[] = { "MIC2", "Aux_R" }; | 214 | static const char *lm49453_adcr_mux_text[] = { "MIC2", "Aux_R" }; |
215 | 215 | ||
216 | static const struct soc_enum lm49453_adcl_enum = | 216 | static SOC_ENUM_SINGLE_DECL(lm49453_adcl_enum, |
217 | SOC_ENUM_SINGLE(LM49453_P0_ANALOG_MIXER_ADC_REG, 0, | 217 | LM49453_P0_ANALOG_MIXER_ADC_REG, 0, |
218 | ARRAY_SIZE(lm49453_adcl_mux_text), | 218 | lm49453_adcl_mux_text); |
219 | lm49453_adcl_mux_text); | ||
220 | 219 | ||
221 | static const struct soc_enum lm49453_adcr_enum = | 220 | static SOC_ENUM_SINGLE_DECL(lm49453_adcr_enum, |
222 | SOC_ENUM_SINGLE(LM49453_P0_ANALOG_MIXER_ADC_REG, 1, | 221 | LM49453_P0_ANALOG_MIXER_ADC_REG, 1, |
223 | ARRAY_SIZE(lm49453_adcr_mux_text), | 222 | lm49453_adcr_mux_text); |
224 | lm49453_adcr_mux_text); | ||
225 | 223 | ||
226 | static const struct snd_kcontrol_new lm49453_adcl_mux_control = | 224 | static const struct snd_kcontrol_new lm49453_adcl_mux_control = |
227 | SOC_DAPM_ENUM("ADC Left Mux", lm49453_adcl_enum); | 225 | SOC_DAPM_ENUM("ADC Left Mux", lm49453_adcl_enum); |
@@ -1409,22 +1407,6 @@ static int lm49453_resume(struct snd_soc_codec *codec) | |||
1409 | return 0; | 1407 | return 0; |
1410 | } | 1408 | } |
1411 | 1409 | ||
1412 | static int lm49453_probe(struct snd_soc_codec *codec) | ||
1413 | { | ||
1414 | struct lm49453_priv *lm49453 = snd_soc_codec_get_drvdata(codec); | ||
1415 | int ret = 0; | ||
1416 | |||
1417 | codec->control_data = lm49453->regmap; | ||
1418 | |||
1419 | ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); | ||
1420 | if (ret < 0) { | ||
1421 | dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); | ||
1422 | return ret; | ||
1423 | } | ||
1424 | |||
1425 | return 0; | ||
1426 | } | ||
1427 | |||
1428 | /* power down chip */ | 1410 | /* power down chip */ |
1429 | static int lm49453_remove(struct snd_soc_codec *codec) | 1411 | static int lm49453_remove(struct snd_soc_codec *codec) |
1430 | { | 1412 | { |
@@ -1433,7 +1415,6 @@ static int lm49453_remove(struct snd_soc_codec *codec) | |||
1433 | } | 1415 | } |
1434 | 1416 | ||
1435 | static struct snd_soc_codec_driver soc_codec_dev_lm49453 = { | 1417 | static struct snd_soc_codec_driver soc_codec_dev_lm49453 = { |
1436 | .probe = lm49453_probe, | ||
1437 | .remove = lm49453_remove, | 1418 | .remove = lm49453_remove, |
1438 | .suspend = lm49453_suspend, | 1419 | .suspend = lm49453_suspend, |
1439 | .resume = lm49453_resume, | 1420 | .resume = lm49453_resume, |