summaryrefslogtreecommitdiffstats
path: root/sound/soc/tegra/Kconfig
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-25 21:22:01 +0000
committerMark Brown <broonie@linaro.org>2014-03-25 21:22:01 +0000
commitba052e1b3155da48d80ecf4a98f48a6681f57f27 (patch)
tree7c3626cdc5960883d0ff04d8665f51632514cc42 /sound/soc/tegra/Kconfig
parenta23af4ab6b6f795fd7f75b9756486d883fea979b (diff)
parentdeeed33850c8a376addabbf971df433b2a1ba74c (diff)
downloadblackbird-op-linux-ba052e1b3155da48d80ecf4a98f48a6681f57f27.tar.gz
blackbird-op-linux-ba052e1b3155da48d80ecf4a98f48a6681f57f27.zip
Merge tag 'asoc-v3.15' into asoc-next
ASoC: Updates for v3.15 Quite a busy release for ASoC this time, more on janitorial work than exciting new features but welcome nontheless: - Lots of cleanups from Takashi for enumerations; the original API for these was error prone so he's refactored lots of code to use more modern APIs which avoid issues. - Elimination of the ASoC level wrappers for I2C and SPI moving us closer to converting to regmap completely and avoiding some randconfig hassle. - Provide both manually and transparently locked DAPM APIs rather than a mix of the two fixing some concurrency issues. - Start converting CODEC drivers to use separate bus interface drivers rather than having them all in one file helping avoid dependency issues. - DPCM support for Intel Haswell and Bay Trail platforms. - Lots of work on improvements for simple-card, DaVinci and the Renesas rcar drivers. - New drivers for Analog Devices ADAU1977, TI PCM512x and parts of the CSR SiRF SoC. # gpg: Signature made Wed 12 Mar 2014 23:05:45 GMT using RSA key ID 7EA229BD # gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>" # gpg: aka "Mark Brown <broonie@debian.org>" # gpg: aka "Mark Brown <broonie@kernel.org>" # gpg: aka "Mark Brown <broonie@tardis.ed.ac.uk>" # gpg: aka "Mark Brown <broonie@linaro.org>" # gpg: aka "Mark Brown <Mark.Brown@linaro.org>"
Diffstat (limited to 'sound/soc/tegra/Kconfig')
-rw-r--r--sound/soc/tegra/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig
index 9f9c1856f822..31198cf7f88d 100644
--- a/sound/soc/tegra/Kconfig
+++ b/sound/soc/tegra/Kconfig
@@ -105,7 +105,7 @@ config SND_SOC_TEGRA_TRIMSLICE
tristate "SoC Audio support for TrimSlice board"
depends on SND_SOC_TEGRA && I2C
select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC
- select SND_SOC_TLV320AIC23
+ select SND_SOC_TLV320AIC23_I2C
help
Say Y or M here if you want to add support for SoC audio on the
TrimSlice platform.
OpenPOWER on IntegriCloud