diff options
Diffstat (limited to 'sound/soc/imx/imx-hdmi-dma.c')
| -rw-r--r-- | sound/soc/imx/imx-hdmi-dma.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sound/soc/imx/imx-hdmi-dma.c b/sound/soc/imx/imx-hdmi-dma.c index 84b350386328..c845672be6aa 100644 --- a/sound/soc/imx/imx-hdmi-dma.c +++ b/sound/soc/imx/imx-hdmi-dma.c @@ -578,6 +578,7 @@ static void hdmi_dma_mmap_copy(struct snd_pcm_substream *substream, } } +#ifdef CONFIG_ARCH_MX6 static void hdmi_sdma_isr(void *data) { struct imx_hdmi_dma_runtime_data *rtd = data; @@ -611,7 +612,7 @@ static void hdmi_sdma_isr(void *data) return; } - +#endif static irqreturn_t hdmi_dma_isr(int irq, void *dev_id) { @@ -876,6 +877,7 @@ static int hdmi_dma_copy(struct snd_pcm_substream *substream, int channel, return 0; } +#ifdef CONFIG_ARCH_MX6 static bool hdmi_filter(struct dma_chan *chan, void *param) { @@ -971,8 +973,7 @@ static int hdmi_sdma_config(struct imx_hdmi_dma_runtime_data *params) return 0; } - - +#endif static int hdmi_dma_hw_free(struct snd_pcm_substream *substream) { @@ -990,7 +991,9 @@ static int hdmi_dma_hw_params(struct snd_pcm_substream *substream, { struct snd_pcm_runtime *runtime = substream->runtime; struct imx_hdmi_dma_runtime_data *rtd = runtime->private_data; +#ifdef CONFIG_ARCH_MX6 int err; +#endif rtd->buffer_bytes = params_buffer_bytes(params); rtd->periods = params_periods(params); @@ -1021,6 +1024,7 @@ static int hdmi_dma_hw_params(struct snd_pcm_substream *substream, } rtd->dma_period_bytes = rtd->period_bytes * rtd->buffer_ratio; +#ifdef CONFIG_ARCH_MX6 if (hdmi_SDMA_check()) { rtd->sdma_params.buffer_num = rtd->periods; rtd->sdma_params.phyaddr = rtd->phy_hdmi_sdma_t; @@ -1038,6 +1042,7 @@ static int hdmi_dma_hw_params(struct snd_pcm_substream *substream, if (err) return err; } +#endif snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); @@ -1067,8 +1072,6 @@ static int hdmi_dma_trigger(struct snd_pcm_substream *substream, int cmd) case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: - if (!check_hdmi_state()) - return 0; rtd->frame_idx = 0; if (runtime->access == SNDRV_PCM_ACCESS_MMAP_INTERLEAVED) { appl_bytes = frames_to_bytes(runtime, |