summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-22 14:29:00 +0100
committerMark Brown <broonie@linaro.org>2013-08-22 14:29:00 +0100
commit1179ace13e9e8956bf403c89117338c67e7a4c82 (patch)
treee8997380f68f71748bb9adff84febf6965c5705c /sound
parenta2e4b255c0633dc4f2356df9cbb9af3dfa49fc73 (diff)
parent226059e1cdbb5d747bd008eba114af0b1a4a621e (diff)
downloadlinux-stable-1179ace13e9e8956bf403c89117338c67e7a4c82.tar.gz
linux-stable-1179ace13e9e8956bf403c89117338c67e7a4c82.tar.bz2
linux-stable-1179ace13e9e8956bf403c89117338c67e7a4c82.zip
Merge remote-tracking branch 'asoc/topic/wm8782' into asoc-next
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8782.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8782.c b/sound/soc/codecs/wm8782.c
index f1fdbf63abb4..8092495605ce 100644
--- a/sound/soc/codecs/wm8782.c
+++ b/sound/soc/codecs/wm8782.c
@@ -26,6 +26,16 @@
#include <sound/initval.h>
#include <sound/soc.h>
+static const struct snd_soc_dapm_widget wm8782_dapm_widgets[] = {
+SND_SOC_DAPM_INPUT("AINL"),
+SND_SOC_DAPM_INPUT("AINR"),
+};
+
+static const struct snd_soc_dapm_route wm8782_dapm_routes[] = {
+ { "Capture", NULL, "AINL" },
+ { "Capture", NULL, "AINR" },
+};
+
static struct snd_soc_dai_driver wm8782_dai = {
.name = "wm8782",
.capture = {
@@ -40,7 +50,12 @@ static struct snd_soc_dai_driver wm8782_dai = {
},
};
-static struct snd_soc_codec_driver soc_codec_dev_wm8782;
+static struct snd_soc_codec_driver soc_codec_dev_wm8782 = {
+ .dapm_widgets = wm8782_dapm_widgets,
+ .num_dapm_widgets = ARRAY_SIZE(wm8782_dapm_widgets),
+ .dapm_routes = wm8782_dapm_routes,
+ .num_dapm_routes = ARRAY_SIZE(wm8782_dapm_routes),
+};
static int wm8782_probe(struct platform_device *pdev)
{