diff options
author | Charles Keepax <ckeepax@opensource.wolfsonmicro.com> | 2013-12-19 04:30:13 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-12-19 05:20:31 -0500 |
commit | 56d37d85438df38e150282baafe52dcd588854c7 (patch) | |
tree | 2de30eea34b1e19e5aea4db1b013fbe3cabd2812 | |
parent | fbedc8cbc3c40281cf52ed0e2e5998dea98e2992 (diff) |
ASoC: wm5110: Add support for ASRC RATE 1
Add support for configuring the sample rate on the SYSCLK side of the
ASRC.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | sound/soc/codecs/arizona.c | 7 | ||||
-rw-r--r-- | sound/soc/codecs/arizona.h | 1 | ||||
-rw-r--r-- | sound/soc/codecs/wm5110.c | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index 56d3ff570ad4..e4295fee8f13 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c | |||
@@ -530,6 +530,13 @@ const struct soc_enum arizona_isrc_fsl[] = { | |||
530 | }; | 530 | }; |
531 | EXPORT_SYMBOL_GPL(arizona_isrc_fsl); | 531 | EXPORT_SYMBOL_GPL(arizona_isrc_fsl); |
532 | 532 | ||
533 | const struct soc_enum arizona_asrc_rate1 = | ||
534 | SOC_VALUE_ENUM_SINGLE(ARIZONA_ASRC_RATE1, | ||
535 | ARIZONA_ASRC_RATE1_SHIFT, 0xf, | ||
536 | ARIZONA_RATE_ENUM_SIZE - 1, | ||
537 | arizona_rate_text, arizona_rate_val); | ||
538 | EXPORT_SYMBOL_GPL(arizona_asrc_rate1); | ||
539 | |||
533 | static const char *arizona_vol_ramp_text[] = { | 540 | static const char *arizona_vol_ramp_text[] = { |
534 | "0ms/6dB", "0.5ms/6dB", "1ms/6dB", "2ms/6dB", "4ms/6dB", "8ms/6dB", | 541 | "0ms/6dB", "0.5ms/6dB", "1ms/6dB", "2ms/6dB", "4ms/6dB", "8ms/6dB", |
535 | "15ms/6dB", "30ms/6dB", | 542 | "15ms/6dB", "30ms/6dB", |
diff --git a/sound/soc/codecs/arizona.h b/sound/soc/codecs/arizona.h index 99a97c06d46a..10b398477203 100644 --- a/sound/soc/codecs/arizona.h +++ b/sound/soc/codecs/arizona.h | |||
@@ -187,6 +187,7 @@ extern const int arizona_rate_val[ARIZONA_RATE_ENUM_SIZE]; | |||
187 | 187 | ||
188 | extern const struct soc_enum arizona_isrc_fsl[]; | 188 | extern const struct soc_enum arizona_isrc_fsl[]; |
189 | extern const struct soc_enum arizona_isrc_fsh[]; | 189 | extern const struct soc_enum arizona_isrc_fsh[]; |
190 | extern const struct soc_enum arizona_asrc_rate1; | ||
190 | 191 | ||
191 | extern const struct soc_enum arizona_in_vi_ramp; | 192 | extern const struct soc_enum arizona_in_vi_ramp; |
192 | extern const struct soc_enum arizona_in_vd_ramp; | 193 | extern const struct soc_enum arizona_in_vd_ramp; |
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index 57be82261c2f..f3d96eae031a 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c | |||
@@ -283,6 +283,7 @@ SOC_VALUE_ENUM("ISRC3 FSL", arizona_isrc_fsl[2]), | |||
283 | SOC_VALUE_ENUM("ISRC1 FSH", arizona_isrc_fsh[0]), | 283 | SOC_VALUE_ENUM("ISRC1 FSH", arizona_isrc_fsh[0]), |
284 | SOC_VALUE_ENUM("ISRC2 FSH", arizona_isrc_fsh[1]), | 284 | SOC_VALUE_ENUM("ISRC2 FSH", arizona_isrc_fsh[1]), |
285 | SOC_VALUE_ENUM("ISRC3 FSH", arizona_isrc_fsh[2]), | 285 | SOC_VALUE_ENUM("ISRC3 FSH", arizona_isrc_fsh[2]), |
286 | SOC_VALUE_ENUM("ASRC RATE 1", arizona_asrc_rate1), | ||
286 | 287 | ||
287 | ARIZONA_MIXER_CONTROLS("DSP1L", ARIZONA_DSP1LMIX_INPUT_1_SOURCE), | 288 | ARIZONA_MIXER_CONTROLS("DSP1L", ARIZONA_DSP1LMIX_INPUT_1_SOURCE), |
288 | ARIZONA_MIXER_CONTROLS("DSP1R", ARIZONA_DSP1RMIX_INPUT_1_SOURCE), | 289 | ARIZONA_MIXER_CONTROLS("DSP1R", ARIZONA_DSP1RMIX_INPUT_1_SOURCE), |