diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/fsl/fsl_ssi.c | 6 | ||||
-rw-r--r-- | sound/soc/fsl/imx-pcm-dma.c | 3 | ||||
-rw-r--r-- | sound/soc/fsl/imx-pcm.h | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 30ff605144c6..4f76b5df0ce4 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c | |||
@@ -746,6 +746,12 @@ static int __devinit fsl_ssi_probe(struct platform_device *pdev) | |||
746 | } | 746 | } |
747 | ssi_private->dma_params_tx.dma = dma_events[0]; | 747 | ssi_private->dma_params_tx.dma = dma_events[0]; |
748 | ssi_private->dma_params_rx.dma = dma_events[1]; | 748 | ssi_private->dma_params_rx.dma = dma_events[1]; |
749 | |||
750 | ssi_private->dma_params_tx.shared_peripheral = | ||
751 | of_device_is_compatible(of_get_parent(np), | ||
752 | "fsl,spba-bus"); | ||
753 | ssi_private->dma_params_rx.shared_peripheral = | ||
754 | ssi_private->dma_params_tx.shared_peripheral; | ||
749 | } | 755 | } |
750 | 756 | ||
751 | /* Initialize the the device_attribute structure */ | 757 | /* Initialize the the device_attribute structure */ |
diff --git a/sound/soc/fsl/imx-pcm-dma.c b/sound/soc/fsl/imx-pcm-dma.c index 6b818de2fc03..f3c0a5ef35c8 100644 --- a/sound/soc/fsl/imx-pcm-dma.c +++ b/sound/soc/fsl/imx-pcm-dma.c | |||
@@ -109,7 +109,8 @@ static int snd_imx_open(struct snd_pcm_substream *substream) | |||
109 | dma_params = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream); | 109 | dma_params = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream); |
110 | 110 | ||
111 | dma_data = kzalloc(sizeof(*dma_data), GFP_KERNEL); | 111 | dma_data = kzalloc(sizeof(*dma_data), GFP_KERNEL); |
112 | dma_data->peripheral_type = IMX_DMATYPE_SSI; | 112 | dma_data->peripheral_type = dma_params->shared_peripheral ? |
113 | IMX_DMATYPE_SSI_SP : IMX_DMATYPE_SSI; | ||
113 | dma_data->priority = DMA_PRIO_HIGH; | 114 | dma_data->priority = DMA_PRIO_HIGH; |
114 | dma_data->dma_request = dma_params->dma; | 115 | dma_data->dma_request = dma_params->dma; |
115 | 116 | ||
diff --git a/sound/soc/fsl/imx-pcm.h b/sound/soc/fsl/imx-pcm.h index b5f5c3acf34d..83c0ed7d55c9 100644 --- a/sound/soc/fsl/imx-pcm.h +++ b/sound/soc/fsl/imx-pcm.h | |||
@@ -22,6 +22,7 @@ struct imx_pcm_dma_params { | |||
22 | int dma; | 22 | int dma; |
23 | unsigned long dma_addr; | 23 | unsigned long dma_addr; |
24 | int burstsize; | 24 | int burstsize; |
25 | bool shared_peripheral; /* The peripheral is on SPBA bus */ | ||
25 | }; | 26 | }; |
26 | 27 | ||
27 | int snd_imx_pcm_mmap(struct snd_pcm_substream *substream, | 28 | int snd_imx_pcm_mmap(struct snd_pcm_substream *substream, |