diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-12-08 09:04:02 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-12-08 09:04:02 -0500 |
commit | e5edba464c11d9d42550f9e3ff97f25196ba50b2 (patch) | |
tree | 269a640ff93c68db724080f73b0e267e024af082 /sound/soc/mxs/mxs-sgtl5000.c | |
parent | 77de61c3975da6f2200935c341e84018ece6ce36 (diff) | |
parent | 1810afd3e1ded09c53d4e966dddce3c7d484521f (diff) |
Merge tag 'asoc-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.19
Lots and lots of changes this time around, the usual set of driver
updates and a huge bulk of cleanups from Lars-Peter. Probably the most
interesting thing for most users is the Intel driver updates which will
(with some more machine integration work) enable support for newer x86
laptops.
- Conversion of AC'97 drivers to use regmap, bringing us closer to the
removal of the ASoC level I/O code.
- Clean up a lot of old drivers that were open coding things that have
subsequently been implemented in the core.
- Some DAPM performance improvements.
- Removal of the now seldom used CODEC mutex.
- Lots of updates for the newer Intel SoC support, including support
for the DSP and some Cherrytrail and Braswell machine drivers.
- Support for Samsung boards using rt5631 as the CODEC.
- Removal of the obsolete AFEB9260 machine driver.
- Driver support for the TI TS3A227E headset driver used in some
Chrombeooks.
Diffstat (limited to 'sound/soc/mxs/mxs-sgtl5000.c')
-rw-r--r-- | sound/soc/mxs/mxs-sgtl5000.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sound/soc/mxs/mxs-sgtl5000.c b/sound/soc/mxs/mxs-sgtl5000.c index 61822cc53bd3..3bba6cfe4f29 100644 --- a/sound/soc/mxs/mxs-sgtl5000.c +++ b/sound/soc/mxs/mxs-sgtl5000.c | |||
@@ -49,13 +49,6 @@ static int mxs_sgtl5000_hw_params(struct snd_pcm_substream *substream, | |||
49 | break; | 49 | break; |
50 | } | 50 | } |
51 | 51 | ||
52 | /* Sgtl5000 sysclk should be >= 8MHz and <= 27M */ | ||
53 | if (mclk < 8000000 || mclk > 27000000) { | ||
54 | dev_err(codec_dai->dev, "Invalid mclk frequency: %u.%03uMHz\n", | ||
55 | mclk / 1000000, mclk / 1000 % 1000); | ||
56 | return -EINVAL; | ||
57 | } | ||
58 | |||
59 | /* Set SGTL5000's SYSCLK (provided by SAIF MCLK) */ | 52 | /* Set SGTL5000's SYSCLK (provided by SAIF MCLK) */ |
60 | ret = snd_soc_dai_set_sysclk(codec_dai, SGTL5000_SYSCLK, mclk, 0); | 53 | ret = snd_soc_dai_set_sysclk(codec_dai, SGTL5000_SYSCLK, mclk, 0); |
61 | if (ret) { | 54 | if (ret) { |