diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-22 13:28:57 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-22 13:28:57 (GMT) |
| commit | 1518eb0abc538ced0c9053590ec7ce4effd32181 (patch) | |
| tree | 8b7c89658262f3175d514e29425ad3252d309472 /sound/soc | |
| parent | 136823384fd3e8c5921769756b78f7cce3d35bce (diff) | |
| parent | e29deb48189cea0be8b24f5912d8c21a18cb0244 (diff) | |
| download | linux-1518eb0abc538ced0c9053590ec7ce4effd32181.tar.xz | |
Merge remote-tracking branch 'asoc/topic/wl1273' into asoc-next
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wl1273.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/sound/soc/codecs/wl1273.c b/sound/soc/codecs/wl1273.c index 54cd3da..b7ab2ef 100644 --- a/sound/soc/codecs/wl1273.c +++ b/sound/soc/codecs/wl1273.c @@ -290,6 +290,18 @@ static const struct snd_kcontrol_new wl1273_controls[] = { snd_wl1273_fm_volume_get, snd_wl1273_fm_volume_put), }; +static const struct snd_soc_dapm_widget wl1273_dapm_widgets[] = { + SND_SOC_DAPM_INPUT("RX"), + + SND_SOC_DAPM_OUTPUT("TX"), +}; + +static const struct snd_soc_dapm_route wl1273_dapm_routes[] = { + { "Capture", NULL, "RX" }, + + { "TX", NULL, "Playback" }, +}; + static int wl1273_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { @@ -483,6 +495,11 @@ static int wl1273_remove(struct snd_soc_codec *codec) static struct snd_soc_codec_driver soc_codec_dev_wl1273 = { .probe = wl1273_probe, .remove = wl1273_remove, + + .dapm_widgets = wl1273_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wl1273_dapm_widgets), + .dapm_routes = wl1273_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wl1273_dapm_routes), }; static int wl1273_platform_probe(struct platform_device *pdev) |