diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-19 12:17:36 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-19 12:19:02 +0100 |
| commit | c34e51b12751c3e81c752b385f02a97bf3f862da (patch) | |
| tree | 7d872e6823a5b35b8254e4e586f97952eba201e1 | |
| parent | c6c0925ea32d37696da7d71631a4a0c999f2094f (diff) | |
| download | linux-stable-c34e51b12751c3e81c752b385f02a97bf3f862da.tar.gz linux-stable-c34e51b12751c3e81c752b385f02a97bf3f862da.tar.bz2 linux-stable-c34e51b12751c3e81c752b385f02a97bf3f862da.zip | |
ASoC: hdmi: Provide stub DAPM integration
Ensure continued operation with DAPM being mandatory.
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | sound/soc/codecs/hdmi.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/sound/soc/codecs/hdmi.c b/sound/soc/codecs/hdmi.c index f0986b9f1939..68342b121c96 100644 --- a/sound/soc/codecs/hdmi.c +++ b/sound/soc/codecs/hdmi.c @@ -23,11 +23,20 @@ #define DRV_NAME "hdmi-audio-codec" -static struct snd_soc_codec_driver hdmi_codec; +static const struct snd_soc_dapm_widget hdmi_widgets[] = { + SND_SOC_DAPM_INPUT("RX"), + SND_SOC_DAPM_OUTPUT("TX"), +}; + +static const struct snd_soc_dapm_route hdmi_routes[] = { + { "Capture", NULL, "RX" }, + { "TX", NULL, "Playback" }, +}; static struct snd_soc_dai_driver hdmi_codec_dai = { .name = "hdmi-hifi", .playback = { + .stream_name = "Playback", .channels_min = 2, .channels_max = 8, .rates = SNDRV_PCM_RATE_32000 | @@ -38,6 +47,7 @@ static struct snd_soc_dai_driver hdmi_codec_dai = { SNDRV_PCM_FMTBIT_S24_LE, }, .capture = { + .stream_name = "Capture", .channels_min = 2, .channels_max = 2, .rates = SNDRV_PCM_RATE_32000 | @@ -50,6 +60,13 @@ static struct snd_soc_dai_driver hdmi_codec_dai = { }; +static struct snd_soc_codec_driver hdmi_codec = { + .dapm_widgets = hdmi_widgets, + .num_dapm_widgets = ARRAY_SIZE(hdmi_widgets), + .dapm_routes = hdmi_routes, + .num_dapm_routes = ARRAY_SIZE(hdmi_routes), +}; + static int hdmi_codec_probe(struct platform_device *pdev) { return snd_soc_register_codec(&pdev->dev, &hdmi_codec, |