]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ENGR00182456-2 HDMI AUDIO: register/unregister when audio pcm open/close
authorChen Liangjun <b36089@freescale.com>
Tue, 21 Aug 2012 09:26:24 +0000 (17:26 +0800)
committerLothar Waßmann <LW@KARO-electronics.de>
Fri, 24 May 2013 06:35:20 +0000 (08:35 +0200)
In this patch:

1. Register substream into HDMI core driver when HDMI audio PCM is open.
2. Unregister substream out of HDMI core driver when HDMI audio PCM is
close.

Signed-off-by: Chen Liangjun <b36089@freescale.com>
sound/soc/imx/imx-hdmi-dma.c

index f0afcf1ac52b60f29210c7c4efc75fe71ba982bf..70c8cb13d3deb4d7e43aa683a228f10f89abcf27 100644 (file)
@@ -1195,6 +1195,12 @@ static int hdmi_dma_open(struct snd_pcm_substream *substream)
                (int)clk_get_rate(hdmi_dma_priv->isfr_clk),
                (int)clk_get_rate(hdmi_dma_priv->iahb_clk));
 
+       ret = mxc_hdmi_register_audio(substream);
+       if (ret < 0) {
+               pr_err("ERROR: HDMI is not ready!\n");
+               return ret;
+       }
+
        hdmi_fifo_reset();
 
        ret = snd_pcm_hw_constraint_integer(substream->runtime,
@@ -1215,6 +1221,7 @@ static int hdmi_dma_close(struct snd_pcm_substream *substream)
        struct imx_hdmi_dma_runtime_data *rtd = runtime->private_data;
 
        hdmi_dma_irq_disable(rtd);
+       mxc_hdmi_unregister_audio(substream);
 
        clk_disable(rtd->iahb_clk);
        clk_disable(rtd->isfr_clk);