Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f52c9192 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: davinci: Don't set unused struct snd_pcm_hardware fields 



The ASoC core assumes that the PCM component of the ASoC card transparently
moves data around and does not impose any restrictions on the memory layout or
the transfer speed. It ignores all fields from the snd_pcm_hardware struct for
the PCM driver that are related to this. Setting these fields in the PCM driver
might suggest otherwise though, so rather not set them.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent ae726e93

sound/soc/davinci/davinci-pcm.c

+0 −28
Original line number Diff line number Diff line
@@ -46,33 +46,11 @@ static void print_buf_info(int slot, char *name) 
}

#endif



#define DAVINCI_PCM_FMTBITS	(\

				SNDRV_PCM_FMTBIT_S8	|\

				SNDRV_PCM_FMTBIT_U8	|\

				SNDRV_PCM_FMTBIT_S16_LE	|\

				SNDRV_PCM_FMTBIT_S16_BE	|\

				SNDRV_PCM_FMTBIT_U16_LE	|\

				SNDRV_PCM_FMTBIT_U16_BE	|\

				SNDRV_PCM_FMTBIT_S24_LE	|\

				SNDRV_PCM_FMTBIT_S24_BE	|\

				SNDRV_PCM_FMTBIT_U24_LE	|\

				SNDRV_PCM_FMTBIT_U24_BE	|\

				SNDRV_PCM_FMTBIT_S32_LE	|\

				SNDRV_PCM_FMTBIT_S32_BE	|\

				SNDRV_PCM_FMTBIT_U32_LE	|\

				SNDRV_PCM_FMTBIT_U32_BE)



static struct snd_pcm_hardware pcm_hardware_playback = {

	.info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |

		 SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |

		 SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME|

		 SNDRV_PCM_INFO_BATCH),

	.formats = DAVINCI_PCM_FMTBITS,

	.rates = SNDRV_PCM_RATE_8000_192000 | SNDRV_PCM_RATE_KNOT,

	.rate_min = 8000,

	.rate_max = 192000,

	.channels_min = 2,

	.channels_max = 384,

	.buffer_bytes_max = 128 * 1024,

	.period_bytes_min = 32,

	.period_bytes_max = 8 * 1024,
@@ -86,12 +64,6 @@ static struct snd_pcm_hardware pcm_hardware_capture = { 
		 SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |

		 SNDRV_PCM_INFO_PAUSE |

		 SNDRV_PCM_INFO_BATCH),

	.formats = DAVINCI_PCM_FMTBITS,

	.rates = SNDRV_PCM_RATE_8000_192000 | SNDRV_PCM_RATE_KNOT,

	.rate_min = 8000,

	.rate_max = 192000,

	.channels_min = 2,

	.channels_max = 384,

	.buffer_bytes_max = 128 * 1024,

	.period_bytes_min = 32,

	.period_bytes_max = 8 * 1024,