aboutsummaryrefslogtreecommitdiff
path: root/sound/soc/s6000/Makefile
diff options
context:
space:
mode:
authorDaniel Glöckner <dg@emlix.com>2009-03-28 19:47:02 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-04-04 15:29:01 +0100
commit2b7dbbe0c9491e62b50978d1615193bec33a8291 (patch)
tree6d8c5782828ce8bc74b3441983136b384d005772 /sound/soc/s6000/Makefile
parent4b166da939012905f4c36fedada62067db31948e (diff)
ASoC: s6105 IP camera machine specific ASoC code
This patch adds machine specific code for the audio part of the Stretch s6105 IP camera reference design. The device uses the tlv320aic31(01) codec to generate the clock for both I2S ports of the soc. While the master clock is generated by a configurable PLL chip, the code assumes the factory default settings. An additional kcontrol has been added to handle the special routing of the board, connecting both HPLCOM and HPROUT to the same pin of the audio jack. One of these should always be switched off. Signed-off-by: Daniel Glöckner <dg@emlix.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/s6000/Makefile')
-rw-r--r--sound/soc/s6000/Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/s6000/Makefile b/sound/soc/s6000/Makefile
index df15f876a1a..7a613612e01 100644
--- a/sound/soc/s6000/Makefile
+++ b/sound/soc/s6000/Makefile
@@ -4,3 +4,8 @@ snd-soc-s6000-i2s-objs := s6000-i2s.o
obj-$(CONFIG_SND_S6000_SOC) += snd-soc-s6000.o
obj-$(CONFIG_SND_S6000_SOC_I2S) += snd-soc-s6000-i2s.o
+
+# s6105 Machine Support
+snd-soc-s6ipcam-objs := s6105-ipcam.o
+
+obj-$(CONFIG_SND_S6000_SOC_S6IPCAM) += snd-soc-s6ipcam.o