diff options
author | Mark Brown <broonie@linaro.org> | 2013-08-22 09:28:58 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-08-22 09:28:58 -0400 |
commit | ab4f0935a8d87a9a4696752dc7775086a836c254 (patch) | |
tree | ef3597e804e7d29d8a1918c2f4239c49da8bc117 | |
parent | 2cb852b52d8c8b54233c7c16d3cf0895e60f8ef8 (diff) | |
parent | 72a061f763c8af8ace650ccb1d01f484a6465608 (diff) |
Merge remote-tracking branch 'asoc/topic/wm8727' into asoc-next
-rw-r--r-- | sound/soc/codecs/wm8727.c | 17 |
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 @@ | |||
23 | #include <sound/initval.h> | 23 | #include <sound/initval.h> |
24 | #include <sound/soc.h> | 24 | #include <sound/soc.h> |
25 | 25 | ||
26 | static const struct snd_soc_dapm_widget wm8727_dapm_widgets[] = { | ||
27 | SND_SOC_DAPM_OUTPUT("VOUTL"), | ||
28 | SND_SOC_DAPM_OUTPUT("VOUTR"), | ||
29 | }; | ||
30 | |||
31 | static const struct snd_soc_dapm_route wm8727_dapm_routes[] = { | ||
32 | { "VOUTL", NULL, "Playback" }, | ||
33 | { "VOUTR", NULL, "Playback" }, | ||
34 | }; | ||
35 | |||
26 | /* | 36 | /* |
27 | * Note this is a simple chip with no configuration interface, sample rate is | 37 | * Note this is a simple chip with no configuration interface, sample rate is |
28 | * determined automatically by examining the Master clock and Bit clock ratios | 38 | * determined automatically by examining the Master clock and Bit clock ratios |
@@ -43,7 +53,12 @@ static struct snd_soc_dai_driver wm8727_dai = { | |||
43 | }, | 53 | }, |
44 | }; | 54 | }; |
45 | 55 | ||
46 | static struct snd_soc_codec_driver soc_codec_dev_wm8727; | 56 | static struct snd_soc_codec_driver soc_codec_dev_wm8727 = { |
57 | .dapm_widgets = wm8727_dapm_widgets, | ||
58 | .num_dapm_widgets = ARRAY_SIZE(wm8727_dapm_widgets), | ||
59 | .dapm_routes = wm8727_dapm_routes, | ||
60 | .num_dapm_routes = ARRAY_SIZE(wm8727_dapm_routes), | ||
61 | }; | ||
47 | 62 | ||
48 | static int wm8727_probe(struct platform_device *pdev) | 63 | static int wm8727_probe(struct platform_device *pdev) |
49 | { | 64 | { |