diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-22 14:28:23 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-22 14:28:23 +0100 |
| commit | 042c325a5a01a71864572ac713ebe5c34323e637 (patch) | |
| tree | e67f118da118ad2caf5bb02e42c1c08effe1d275 | |
| parent | f14c6f97c20572c60a065a9dec67b1d5ac7fb514 (diff) | |
| parent | ae48f5efb8b33af3d8b4201250ae8c3cab551557 (diff) | |
| download | blackbird-op-linux-042c325a5a01a71864572ac713ebe5c34323e637.tar.gz blackbird-op-linux-042c325a5a01a71864572ac713ebe5c34323e637.zip | |
Merge remote-tracking branch 'asoc/topic/ad73311' into asoc-next
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | sound/soc/codecs/ad73311.c | 22 |
2 files changed, 22 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 229c66b12cc2..79fa57229b85 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -595,6 +595,7 @@ S: Supported F: sound/soc/codecs/adau* F: sound/soc/codecs/adav* F: sound/soc/codecs/ad1* +F: sound/soc/codecs/ad7* F: sound/soc/codecs/ssm* F: sound/soc/codecs/sigmadsp.* diff --git a/sound/soc/codecs/ad73311.c b/sound/soc/codecs/ad73311.c index b1f2baf42b48..5fac8adbc136 100644 --- a/sound/soc/codecs/ad73311.c +++ b/sound/soc/codecs/ad73311.c @@ -23,6 +23,21 @@ #include "ad73311.h" +static const struct snd_soc_dapm_widget ad73311_dapm_widgets[] = { +SND_SOC_DAPM_INPUT("VINP"), +SND_SOC_DAPM_INPUT("VINN"), +SND_SOC_DAPM_OUTPUT("VOUTN"), +SND_SOC_DAPM_OUTPUT("VOUTP"), +}; + +static const struct snd_soc_dapm_route ad73311_dapm_routes[] = { + { "Capture", NULL, "VINP" }, + { "Capture", NULL, "VINN" }, + + { "VOUTN", NULL, "Playback" }, + { "VOUTP", NULL, "Playback" }, +}; + static struct snd_soc_dai_driver ad73311_dai = { .name = "ad73311-hifi", .playback = { @@ -39,7 +54,12 @@ static struct snd_soc_dai_driver ad73311_dai = { .formats = SNDRV_PCM_FMTBIT_S16_LE, }, }; -static struct snd_soc_codec_driver soc_codec_dev_ad73311; +static struct snd_soc_codec_driver soc_codec_dev_ad73311 = { + .dapm_widgets = ad73311_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(ad73311_dapm_widgets), + .dapm_routes = ad73311_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(ad73311_dapm_routes), +}; static int ad73311_probe(struct platform_device *pdev) { |
