summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-22 14:28:58 +0100
committerMark Brown <broonie@linaro.org>2013-08-22 14:28:58 +0100
commitab4f0935a8d87a9a4696752dc7775086a836c254 (patch)
treeef3597e804e7d29d8a1918c2f4239c49da8bc117 /sound/soc
parent2cb852b52d8c8b54233c7c16d3cf0895e60f8ef8 (diff)
parent72a061f763c8af8ace650ccb1d01f484a6465608 (diff)
downloadblackbird-op-linux-ab4f0935a8d87a9a4696752dc7775086a836c254.tar.gz
blackbird-op-linux-ab4f0935a8d87a9a4696752dc7775086a836c254.zip
Merge remote-tracking branch 'asoc/topic/wm8727' into asoc-next
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/wm8727.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8727.c b/sound/soc/codecs/wm8727.c
index 462f5e4d5c05..7b1a6d5c11c6 100644
--- a/sound/soc/codecs/wm8727.c
+++ b/sound/soc/codecs/wm8727.c
@@ -23,6 +23,16 @@
#include <sound/initval.h>
#include <sound/soc.h>
+static const struct snd_soc_dapm_widget wm8727_dapm_widgets[] = {
+SND_SOC_DAPM_OUTPUT("VOUTL"),
+SND_SOC_DAPM_OUTPUT("VOUTR"),
+};
+
+static const struct snd_soc_dapm_route wm8727_dapm_routes[] = {
+ { "VOUTL", NULL, "Playback" },
+ { "VOUTR", NULL, "Playback" },
+};
+
/*
* Note this is a simple chip with no configuration interface, sample rate is
* determined automatically by examining the Master clock and Bit clock ratios
@@ -43,7 +53,12 @@ static struct snd_soc_dai_driver wm8727_dai = {
},
};
-static struct snd_soc_codec_driver soc_codec_dev_wm8727;
+static struct snd_soc_codec_driver soc_codec_dev_wm8727 = {
+ .dapm_widgets = wm8727_dapm_widgets,
+ .num_dapm_widgets = ARRAY_SIZE(wm8727_dapm_widgets),
+ .dapm_routes = wm8727_dapm_routes,
+ .num_dapm_routes = ARRAY_SIZE(wm8727_dapm_routes),
+};
static int wm8727_probe(struct platform_device *pdev)
{
OpenPOWER on IntegriCloud