ASoC: hdmi: Provide stub DAPM integration
authorMark Brown <broonie@linaro.org>
Mon, 19 Aug 2013 11:17:36 +0000 (12:17 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 19 Aug 2013 11:19:02 +0000 (12:19 +0100)
Ensure continued operation with DAPM being mandatory.

Signed-off-by: Mark Brown <broonie@linaro.org>
sound/soc/codecs/hdmi.c

index f0986b9..68342b1 100644 (file)
 
 #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,