Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 042c325a5a01a71864572ac713ebe5c34323e637

Authored by Mark Brown
2 parents f14c6f97c2 ae48f5efb8
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

Merge remote-tracking branch 'asoc/topic/ad73311' into asoc-next

Showing 2 changed files Side-by-side Diff

... ... @@ -595,6 +595,7 @@
595 595 F: sound/soc/codecs/adau*
596 596 F: sound/soc/codecs/adav*
597 597 F: sound/soc/codecs/ad1*
  598 +F: sound/soc/codecs/ad7*
598 599 F: sound/soc/codecs/ssm*
599 600 F: sound/soc/codecs/sigmadsp.*
600 601  
sound/soc/codecs/ad73311.c
Diff comments   View file @ 042c325
... ... @@ -23,6 +23,21 @@
23 23  
24 24 #include "ad73311.h"
25 25  
  26 +static const struct snd_soc_dapm_widget ad73311_dapm_widgets[] = {
  27 +SND_SOC_DAPM_INPUT("VINP"),
  28 +SND_SOC_DAPM_INPUT("VINN"),
  29 +SND_SOC_DAPM_OUTPUT("VOUTN"),
  30 +SND_SOC_DAPM_OUTPUT("VOUTP"),
  31 +};
  32 +
  33 +static const struct snd_soc_dapm_route ad73311_dapm_routes[] = {
  34 + { "Capture", NULL, "VINP" },
  35 + { "Capture", NULL, "VINN" },
  36 +
  37 + { "VOUTN", NULL, "Playback" },
  38 + { "VOUTP", NULL, "Playback" },
  39 +};
  40 +
26 41 static struct snd_soc_dai_driver ad73311_dai = {
27 42 .name = "ad73311-hifi",
28 43 .playback = {
... ... @@ -39,7 +54,12 @@
39 54 .formats = SNDRV_PCM_FMTBIT_S16_LE, },
40 55 };
41 56  
42   -static struct snd_soc_codec_driver soc_codec_dev_ad73311;
  57 +static struct snd_soc_codec_driver soc_codec_dev_ad73311 = {
  58 + .dapm_widgets = ad73311_dapm_widgets,
  59 + .num_dapm_widgets = ARRAY_SIZE(ad73311_dapm_widgets),
  60 + .dapm_routes = ad73311_dapm_routes,
  61 + .num_dapm_routes = ARRAY_SIZE(ad73311_dapm_routes),
  62 +};
43 63  
44 64 static int ad73311_probe(struct platform_device *pdev)
45 65 {