diff options
| author | Ziyann <jaraidaniel@gmail.com> | 2014-06-30 01:06:51 +0200 |
|---|---|---|
| committer | Ziyann <jaraidaniel@gmail.com> | 2014-10-01 13:00:01 +0200 |
| commit | eacac216d0a72c63a21755eba0b364db77366a7e (patch) | |
| tree | 5b4d0754912964dad2fb7ef8ae4037c08e58140d /sound | |
| parent | 2477c1ccddba2487df3e49fe9f13ab8dc4030851 (diff) | |
| download | kernel_samsung_tuna-eacac216d0a72c63a21755eba0b364db77366a7e.tar.gz kernel_samsung_tuna-eacac216d0a72c63a21755eba0b364db77366a7e.tar.bz2 kernel_samsung_tuna-eacac216d0a72c63a21755eba0b364db77366a7e.zip | |
Revert "ASoC: ABE: Use DMA at 16-bits specifically for 16-bits mono"
This reverts commit b9115fb1007f7a6c925d23330c561b3526711401.
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/omap/omap-abe.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sound/soc/omap/omap-abe.c b/sound/soc/omap/omap-abe.c index 384c187e4e7..4474b6e8d45 100644 --- a/sound/soc/omap/omap-abe.c +++ b/sound/soc/omap/omap-abe.c @@ -69,11 +69,13 @@ static struct omap_pcm_dma_data omap_abe_dai_dma_params[7][2] = { { .name = "Media Playback", .dma_req = OMAP44XX_DMA_ABE_REQ_0, + .data_type = OMAP_DMA_DATA_TYPE_S32, .sync_mode = OMAP_DMA_SYNC_PACKET, }, { .name = "Media Capture1", .dma_req = OMAP44XX_DMA_ABE_REQ_3, + .data_type = OMAP_DMA_DATA_TYPE_S32, .sync_mode = OMAP_DMA_SYNC_PACKET, }, }, @@ -82,6 +84,7 @@ static struct omap_pcm_dma_data omap_abe_dai_dma_params[7][2] = { { .name = "Media Capture2", .dma_req = OMAP44XX_DMA_ABE_REQ_4, + .data_type = OMAP_DMA_DATA_TYPE_S32, .sync_mode = OMAP_DMA_SYNC_PACKET, }, }, @@ -89,11 +92,13 @@ static struct omap_pcm_dma_data omap_abe_dai_dma_params[7][2] = { { .name = "Voice Playback", .dma_req = OMAP44XX_DMA_ABE_REQ_1, + .data_type = OMAP_DMA_DATA_TYPE_S32, .sync_mode = OMAP_DMA_SYNC_PACKET, }, { .name = "Voice Capture", .dma_req = OMAP44XX_DMA_ABE_REQ_2, + .data_type = OMAP_DMA_DATA_TYPE_S32, .sync_mode = OMAP_DMA_SYNC_PACKET, }, }, @@ -101,6 +106,7 @@ static struct omap_pcm_dma_data omap_abe_dai_dma_params[7][2] = { { .name = "Tones Playback", .dma_req = OMAP44XX_DMA_ABE_REQ_5, + .data_type = OMAP_DMA_DATA_TYPE_S32, .sync_mode = OMAP_DMA_SYNC_PACKET, },{}, }, @@ -108,6 +114,7 @@ static struct omap_pcm_dma_data omap_abe_dai_dma_params[7][2] = { { .name = "Vibra Playback", .dma_req = OMAP44XX_DMA_ABE_REQ_6, + .data_type = OMAP_DMA_DATA_TYPE_S32, .sync_mode = OMAP_DMA_SYNC_PACKET, },{}, }, @@ -115,11 +122,13 @@ static struct omap_pcm_dma_data omap_abe_dai_dma_params[7][2] = { { .name = "MODEM Playback", .dma_req = OMAP44XX_DMA_ABE_REQ_1, + .data_type = OMAP_DMA_DATA_TYPE_S32, .sync_mode = OMAP_DMA_SYNC_PACKET, }, { .name = "MODEM Capture", .dma_req = OMAP44XX_DMA_ABE_REQ_2, + .data_type = OMAP_DMA_DATA_TYPE_S32, .sync_mode = OMAP_DMA_SYNC_PACKET, }, }, @@ -127,6 +136,7 @@ static struct omap_pcm_dma_data omap_abe_dai_dma_params[7][2] = { { .name = "Low Power Playback", .dma_req = OMAP44XX_DMA_ABE_REQ_0, + .data_type = OMAP_DMA_DATA_TYPE_S32, .sync_mode = OMAP_DMA_SYNC_PACKET, },{}, },}; @@ -926,7 +936,6 @@ static int omap_abe_dai_hw_params(struct snd_pcm_substream *substream, abe_data_format_t format; abe_dma_t dma_sink; abe_dma_t dma_params; - int data_type = OMAP_DMA_DATA_TYPE_S32; int ret; dev_dbg(dai->dev, "%s: %s\n", __func__, dai->name); @@ -943,7 +952,7 @@ static int omap_abe_dai_hw_params(struct snd_pcm_substream *substream, case 1: if (params_format(params) == SNDRV_PCM_FORMAT_S16_LE) { format.samp_format = MONO_RSHIFTED_16; - data_type = OMAP_DMA_DATA_TYPE_S16; + dma_data->data_type = OMAP_DMA_DATA_TYPE_S16; } else { format.samp_format = MONO_MSB; } @@ -1052,7 +1061,6 @@ static int omap_abe_dai_hw_params(struct snd_pcm_substream *substream, /* configure frontend SDMA data */ dma_data->port_addr = (unsigned long)dma_params.data; dma_data->packet_size = dma_params.iter; - dma_data->data_type = data_type; if (dai->id == ABE_FRONTEND_DAI_MODEM) { /* call hw_params on McBSP with correct DMA data */ |