ASoC: dpcm: Add helper function for initializing runtime pcm
Subsystems (8)
PATCH v2 1/11 ASoC: dpcm: Add helper function for initializing runtime pcm
We have the same code for initializing the runtime pcm on both the playback and the capture path. Factor this out into a common helper function.
---
New in v2
--- sound/soc/soc-pcm.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
sound/soc/soc-pcm.c +15 -15
@@ -1235,6 +1235,17 @@ unwind:return err; } +static void dpcm_init_runtime_hw (struct snd_pcm_runtime *runtime, +struct snd_soc_pcm_stream *stream) +{ + runtime->hw.rate_min = stream->rate_min; + runtime->hw.rate_max = stream->rate_max; + runtime->hw.channels_min = stream->channels_min; + runtime->hw.channels_max = stream->channels_max; + runtime->hw.formats &= stream->formats; + runtime->hw.rates = stream->rates; +} +static void dpcm_set_fe_runtime (struct snd_pcm_substream *substream) {struct snd_pcm_runtime *runtime = substream->runtime;
@@ -1242,21 +1253,10 @@ static void dpcm_set_fe_runtime(struct snd_pcm_substream *substream)struct snd_soc_dai *cpu_dai = rtd->cpu_dai;struct snd_soc_dai_driver *cpu_dai_drv = cpu_dai->driver; -if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { - runtime->hw.rate_min = cpu_dai_drv->playback.rate_min; - runtime->hw.rate_max = cpu_dai_drv->playback.rate_max; - runtime->hw.channels_min = cpu_dai_drv->playback.channels_min; - runtime->hw.channels_max = cpu_dai_drv->playback.channels_max; - runtime->hw.formats &= cpu_dai_drv->playback.formats; - runtime->hw.rates = cpu_dai_drv->playback.rates; - }else { - runtime->hw.rate_min = cpu_dai_drv->capture.rate_min; - runtime->hw.rate_max = cpu_dai_drv->capture.rate_max; - runtime->hw.channels_min = cpu_dai_drv->capture.channels_min; - runtime->hw.channels_max = cpu_dai_drv->capture.channels_max; - runtime->hw.formats &= cpu_dai_drv->capture.formats; - runtime->hw.rates = cpu_dai_drv->capture.rates; - } +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) +dpcm_init_runtime_hw (runtime, &cpu_dai_drv->playback); +else +dpcm_init_runtime_hw (runtime, &cpu_dai_drv->capture); }static int dpcm_fe_dai_startup (struct snd_pcm_substream *fe_substream)
Signature · 1 line
1.8.0
PATCH v2 2/11 ASoC: dpcm: Allow PCMs to omit the set of supported formats
Allow PCMs that do not impose any restrictions on the supported formats to set the formats field to 0, Instead of assuming that this means that the PCM does not support any formats (which doesn't make much sense), assume that it supports all formats. This brings the behavior of DPCM closer to that of non-DPCM.
---
New in v2
--- sound/soc/soc-pcm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/soc-pcm.c +4 -1
@@ -1242,7 +1242,10 @@ static void dpcm_init_runtime_hw(struct snd_pcm_runtime *runtime, runtime->hw.rate_max = stream->rate_max; runtime->hw.channels_min = stream->channels_min; runtime->hw.channels_max = stream->channels_max; - runtime->hw.formats &= stream->formats; +if (runtime->hw.formats) + runtime->hw.formats &= stream->formats; +else + runtime->hw.formats = stream->formats; runtime->hw.rates = stream->rates; }
Signature · 1 line
1.8.0
Re: [PATCH v2 02/11] ASoC: dpcm: Allow PCMs to omit the set of supported formats
Quoted 4 lines · Lars-Peter Clausen
Allow PCMs that do not impose any restrictions on the supported formats to set the formats field to 0, Instead of assuming that this means that the PCM does not support any formats (which doesn't make much sense), assume that it supports all formats. This brings the behavior of DPCM closer to that of non-DPCM.
Applied, thanks.
PATCH v2 3/11 ASoC: atmel: Don't set unused struct snd_pcm_hardware fields
In reply to Lars-Peter ClausenThe 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.
---
No changes in v2
--- sound/soc/atmel/atmel-pcm-dma.c | 1 - sound/soc/atmel/atmel-pcm-pdc.c | 1 - 2 files changed, 2 deletions(-)
sound/soc/atmel/atmel-pcm-dma.c +0 -1
@@ -50,7 +50,6 @@ static const struct snd_pcm_hardware atmel_pcm_dma_hardware = {SNDRV_PCM_INFO_INTERLEAVED |SNDRV_PCM_INFO_RESUME | SNDRV_PCM_INFO_PAUSE, - .formats = SNDRV_PCM_FMTBIT_S16_LE, .period_bytes_min = 256, /* lighting DMA overhead */ .period_bytes_max = 2 * 0xffff, /* if 2 bytes format */ .periods_min = 8,
sound/soc/atmel/atmel-pcm-pdc.c +0 -1
@@ -58,7 +58,6 @@ static const struct snd_pcm_hardware atmel_pcm_hardware = {SNDRV_PCM_INFO_MMAP_VALID |SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_PAUSE, - .formats = SNDRV_PCM_FMTBIT_S16_LE, .period_bytes_min = 32, .period_bytes_max = 8192, .periods_min = 2,
Signature · 1 line
1.8.0
PATCH v2 4/11 ASoC: fsl: Don't set unused struct snd_pcm_hardware fields
In reply to Lars-Peter ClausenThe 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.
---
Changes since v1:
* Don't clear supported formats field, as formats supported by the DMA are more restrictive than those supported by DAI. Note that this won't have any effect though until the last patch in this series has been applied
--- sound/soc/fsl/fsl_dma.c | 7 ------- sound/soc/fsl/imx-pcm-dma.c | 3 --- sound/soc/fsl/imx-pcm-fiq.c | 3 --- sound/soc/fsl/mpc5200_dma.c | 4 ---- 4 files changed, 17 deletions(-)
sound/soc/fsl/fsl_dma.c +0 -7
@@ -55,10 +55,6 @@ SNDRV_PCM_FMTBIT_S32_BE | \ SNDRV_PCM_FMTBIT_U32_LE | \ SNDRV_PCM_FMTBIT_U32_BE) - -#define FSLDMA_PCM_RATES (SNDRV_PCM_RATE_5512 | SNDRV_PCM_RATE_8000_192000 | \ - SNDRV_PCM_RATE_CONTINUOUS) - struct dma_object { struct snd_soc_platform_driver dai; dma_addr_t ssi_stx_phys;
@@ -140,9 +136,6 @@ static const struct snd_pcm_hardware fsl_dma_hardware = {SNDRV_PCM_INFO_JOINT_DUPLEX | SNDRV_PCM_INFO_PAUSE, .formats = FSLDMA_PCM_FORMATS, - .rates = FSLDMA_PCM_RATES, - .rate_min = 5512, - .rate_max = 192000, .period_bytes_min = 512, /* A reasonable limit */ .period_bytes_max = (u32) -1, .periods_min = NUM_DMA_LINKS,
sound/soc/fsl/imx-pcm-dma.c +0 -3
@@ -41,9 +41,6 @@ static const struct snd_pcm_hardware imx_pcm_hardware = {SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME, .formats = SNDRV_PCM_FMTBIT_S16_LE, - .rate_min = 8000, - .channels_min = 2, - .channels_max = 2, .buffer_bytes_max = IMX_SSI_DMABUF_SIZE, .period_bytes_min = 128, .period_bytes_max = 65535, /* Limited by SDMA engine */
sound/soc/fsl/imx-pcm-fiq.c +0 -3
@@ -162,9 +162,6 @@ static struct snd_pcm_hardware snd_imx_hardware = {SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME, .formats = SNDRV_PCM_FMTBIT_S16_LE, - .rate_min = 8000, - .channels_min = 2, - .channels_max = 2, .buffer_bytes_max = IMX_SSI_DMABUF_SIZE, .period_bytes_min = 128, .period_bytes_max = 16 * 1024,
sound/soc/fsl/mpc5200_dma.c +0 -4
@@ -200,10 +200,6 @@ static const struct snd_pcm_hardware psc_dma_hardware = { SNDRV_PCM_INFO_BATCH, .formats =SNDRV_PCM_FMTBIT_S8 |SNDRV_PCM_FMTBIT_S16_BE | SNDRV_PCM_FMTBIT_S24_BE | SNDRV_PCM_FMTBIT_S32_BE, - .rate_min = 8000, - .rate_max = 48000, - .channels_min = 1, - .channels_max = 2, .period_bytes_max = 1024 * 1024, .period_bytes_min = 32, .periods_min = 2,
Signature · 1 line
1.8.0
Re: [PATCH v2 04/11] ASoC: fsl: Don't set unused struct snd_pcm_hardware fields
Quoted 5 lines · Lars-Peter Clausen
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_hardwarestruct 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.
Applied, thanks.
PATCH v2 5/11 ASoC: intel: Don't set unused struct snd_pcm_hardware fields
In reply to Lars-Peter ClausenThe 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.
---
No changes since v1
--- sound/soc/intel/sst_platform.c | 10 ---------- sound/soc/intel/sst_platform.h | 4 ---- 2 files changed, 14 deletions(-)
sound/soc/intel/sst_platform.c +0 -10
@@ -89,16 +89,6 @@ static struct snd_pcm_hardware sst_platform_pcm_hw = {SNDRV_PCM_INFO_MMAP_VALID |SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_SYNC_START), - .formats = (SNDRV_PCM_FMTBIT_S16 |SNDRV_PCM_FMTBIT_U16 | -SNDRV_PCM_FMTBIT_S24 |SNDRV_PCM_FMTBIT_U24 | - SNDRV_PCM_FMTBIT_S32 | SNDRV_PCM_FMTBIT_U32), - .rates = (SNDRV_PCM_RATE_8000 | -SNDRV_PCM_RATE_44100 | - SNDRV_PCM_RATE_48000), - .rate_min = SST_MIN_RATE, - .rate_max = SST_MAX_RATE, - .channels_min = SST_MIN_CHANNEL, - .channels_max = SST_MAX_CHANNEL, .buffer_bytes_max = SST_MAX_BUFFER, .period_bytes_min = SST_MIN_PERIOD_BYTES, .period_bytes_max = SST_MAX_PERIOD_BYTES,
sound/soc/intel/sst_platform.h +0 -4
@@ -33,10 +33,6 @@#define SST_STEREO 2#define SST_MAX_CAP 5 -#define SST_MIN_RATE 8000 -#define SST_MAX_RATE 48000 -#define SST_MIN_CHANNEL 1 -#define SST_MAX_CHANNEL 5#define SST_MAX_BUFFER (800*1024)#define SST_MIN_BUFFER (800*1024)#define SST_MIN_PERIOD_BYTES 32
Signature · 1 line
1.8.0
Re: [PATCH v2 05/11] ASoC: intel: Don't set unused struct snd_pcm_hardware fields
Quoted 5 lines · Lars-Peter Clausen
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_hardwarestruct 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.
Applied, thanks.
PATCH v2 6/11 ASoC: kirkwood: Don't set unused struct snd_pcm_hardware fields
In reply to Lars-Peter ClausenThe 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.
---
No changes since v1
--- sound/soc/kirkwood/kirkwood-dma.c | 16 ---------------- 1 file changed, 16 deletions(-)
sound/soc/kirkwood/kirkwood-dma.c +0 -16
@@ -21,16 +21,6 @@#include <sound/soc.h> #include "kirkwood.h" -#define KIRKWOOD_RATES \ - (SNDRV_PCM_RATE_8000_192000 | \ - SNDRV_PCM_RATE_CONTINUOUS | \ - SNDRV_PCM_RATE_KNOT) - -#define KIRKWOOD_FORMATS \ - (SNDRV_PCM_FMTBIT_S16_LE | \ - SNDRV_PCM_FMTBIT_S24_LE | \ - SNDRV_PCM_FMTBIT_S32_LE) -static struct kirkwood_dma_data *kirkwood_priv (struct snd_pcm_substream *subs) {struct snd_soc_pcm_runtime *soc_runtime = subs->private_data;
@@ -43,12 +33,6 @@ static struct snd_pcm_hardware kirkwood_dma_snd_hw = {SNDRV_PCM_INFO_MMAP_VALID |SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_PAUSE), - .formats = KIRKWOOD_FORMATS, - .rates = KIRKWOOD_RATES, - .rate_min = 8000, - .rate_max = 384000, - .channels_min = 1, - .channels_max = 8, .buffer_bytes_max = KIRKWOOD_SND_MAX_BUFFER_BYTES, .period_bytes_min = KIRKWOOD_SND_MIN_PERIOD_BYTES, .period_bytes_max = KIRKWOOD_SND_MAX_PERIOD_BYTES,
Signature · 1 line
1.8.0
Re: [PATCH v2 06/11] ASoC: kirkwood: Don't set unused struct snd_pcm_hardware fields
Quoted 5 lines · Lars-Peter Clausen
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_hardwarestruct 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.
Applied, thanks.
PATCH v2 7/11 ASoC: mxs: Don't set unused struct snd_pcm_hardware fields
In reply to Lars-Peter ClausenThe 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.
---
No changes since v1
--- sound/soc/mxs/mxs-pcm.c | 5 ----- 1 file changed, 5 deletions(-)
sound/soc/mxs/mxs-pcm.c +0 -5
@@ -36,11 +36,6 @@ static const struct snd_pcm_hardware snd_mxs_hardware = {SNDRV_PCM_INFO_RESUME |SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_HALF_DUPLEX, - .formats =SNDRV_PCM_FMTBIT_S16_LE | -SNDRV_PCM_FMTBIT_S20_3LE | - SNDRV_PCM_FMTBIT_S24_LE, - .channels_min = 2, - .channels_max = 2, .period_bytes_min = 32, .period_bytes_max = 8192, .periods_min = 1,
Signature · 1 line
1.8.0
Re: [PATCH v2 07/11] ASoC: mxs: Don't set unused struct snd_pcm_hardware fields
Quoted 5 lines · Lars-Peter Clausen
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_hardwarestruct 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.
Applied, thanks.
PATCH v2 8/11 ASoC: nuc900: Don't set unused struct snd_pcm_hardware fields
In reply to Lars-Peter ClausenThe 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.
---
No changes since v1
--- sound/soc/nuc900/nuc900-pcm.c | 3 --- 1 file changed, 3 deletions(-)
sound/soc/nuc900/nuc900-pcm.c +0 -3
@@ -32,9 +32,6 @@ static const struct snd_pcm_hardware nuc900_pcm_hardware = {SNDRV_PCM_INFO_MMAP_VALID |SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME, - .formats = SNDRV_PCM_FMTBIT_S16_LE, - .channels_min = 1, - .channels_max = 2, .buffer_bytes_max = 4*1024, .period_bytes_min = 1*1024, .period_bytes_max = 4*1024,
Signature · 1 line
1.8.0
Re: [PATCH v2 08/11] ASoC: nuc900: Don't set unused struct snd_pcm_hardware fields
Quoted 5 lines · Lars-Peter Clausen
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_hardwarestruct 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.
Applied, thanks.
PATCH v2 9/11 ASoC: sh: Don't set unused struct snd_pcm_hardware fields
In reply to Lars-Peter ClausenThe 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.
---
No changes since v1
--- sound/soc/sh/dma-sh7760.c | 17 ----------------- sound/soc/sh/fsi.c | 6 ------ sound/soc/sh/rcar/core.c | 6 ------ 3 files changed, 29 deletions(-)
sound/soc/sh/dma-sh7760.c +0 -17
@@ -89,29 +89,12 @@ struct camelot_pcm {#define DMABRG_PREALLOC_BUFFER 32 * 1024#define DMABRG_PREALLOC_BUFFER_MAX 32 * 1024 -/* support everything the SSI supports */ -#define DMABRG_RATES \ - SNDRV_PCM_RATE_8000_192000 - -#define DMABRG_FMTS \ - (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U8 | \ - SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_U16_LE | \ - SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_U20_3LE | \ - SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_U24_3LE | \ - SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_U32_LE) -static struct snd_pcm_hardware camelot_pcm_hardware = { .info = (SNDRV_PCM_INFO_MMAP |SNDRV_PCM_INFO_INTERLEAVED |SNDRV_PCM_INFO_BLOCK_TRANSFER |SNDRV_PCM_INFO_MMAP_VALID |SNDRV_PCM_INFO_BATCH ), - .formats =DMABRG_FMTS , - .rates =DMABRG_RATES , - .rate_min =8000 , - .rate_max =192000 , - .channels_min =2 , - .channels_max =8 ,/* max of the SSI */ .buffer_bytes_max =DMABRG_PERIOD_MAX , .period_bytes_min =DMABRG_PERIOD_MIN , .period_bytes_max =DMABRG_PERIOD_MAX /2 ,
sound/soc/sh/fsi.c +0 -6
@@ -1787,12 +1787,6 @@ static struct snd_pcm_hardware fsi_pcm_hardware = {SNDRV_PCM_INFO_MMAP |SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE, - .formats = FSI_FMTS, - .rates = FSI_RATES, - .rate_min = 8000, - .rate_max = 192000, - .channels_min = 2, - .channels_max = 2, .buffer_bytes_max = 64 * 1024, .period_bytes_min = 32, .period_bytes_max = 8192,
sound/soc/sh/rcar/core.c +0 -6
@@ -628,12 +628,6 @@ static struct snd_pcm_hardware rsnd_pcm_hardware = {SNDRV_PCM_INFO_MMAP |SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE, - .formats = RSND_FMTS, - .rates = RSND_RATES, - .rate_min = 8000, - .rate_max = 192000, - .channels_min = 2, - .channels_max = 2, .buffer_bytes_max = 64 * 1024, .period_bytes_min = 32, .period_bytes_max = 8192,
Signature · 1 line
1.8.0
Re: [PATCH v2 09/11] ASoC: sh: Don't set unused struct snd_pcm_hardware fields
Quoted 5 lines · Lars-Peter Clausen
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_hardwarestruct 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.
Applied, thanks.
PATCH v2 10/11 ASoC: ux500: Don't set unused struct snd_pcm_hardware fields
In reply to Lars-Peter ClausenThe 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.
---
No changes since v1
--- sound/soc/ux500/ux500_pcm.c | 15 --------------- 1 file changed, 15 deletions(-)
sound/soc/ux500/ux500_pcm.c +0 -15
@@ -28,12 +28,6 @@#include "ux500_msp_i2s.h" #include "ux500_pcm.h" -#define UX500_PLATFORM_MIN_RATE 8000 -#define UX500_PLATFORM_MAX_RATE 48000 - -#define UX500_PLATFORM_MIN_CHANNELS 1 -#define UX500_PLATFORM_MAX_CHANNELS 8 -#define UX500_PLATFORM_PERIODS_BYTES_MIN 128#define UX500_PLATFORM_PERIODS_BYTES_MAX (64 * PAGE_SIZE)#define UX500_PLATFORM_PERIODS_MIN 2
@@ -45,15 +39,6 @@ static const struct snd_pcm_hardware ux500_pcm_hw = {SNDRV_PCM_INFO_MMAP |SNDRV_PCM_INFO_RESUME | SNDRV_PCM_INFO_PAUSE, - .formats =SNDRV_PCM_FMTBIT_S16_LE | -SNDRV_PCM_FMTBIT_U16_LE | -SNDRV_PCM_FMTBIT_S16_BE | - SNDRV_PCM_FMTBIT_U16_BE, - .rates = SNDRV_PCM_RATE_KNOT, - .rate_min = UX500_PLATFORM_MIN_RATE, - .rate_max = UX500_PLATFORM_MAX_RATE, - .channels_min = UX500_PLATFORM_MIN_CHANNELS, - .channels_max = UX500_PLATFORM_MAX_CHANNELS, .buffer_bytes_max = UX500_PLATFORM_BUFFER_BYTES_MAX, .period_bytes_min = UX500_PLATFORM_PERIODS_BYTES_MIN, .period_bytes_max = UX500_PLATFORM_PERIODS_BYTES_MAX,
Signature · 1 line
1.8.0
Re: [PATCH v2 10/11] ASoC: ux500: Don't set unused struct snd_pcm_hardware fields
Quoted 5 lines · Lars-Peter Clausen
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_hardwarestruct 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.
Applied, thanks.
PATCH v2 11/11 ASoC: Allow PCMs to restrict the supported formats
In reply to Lars-Peter ClausenSome DMA cores might add additional restrictions on which in memory audio formats can be supported by the compound sound card. If the PCM component specifies a set of formats it supports (by setting the formats field to non 0) take these into account when calculating the format set for the compound sound card.
---
New in v1. Note that this patch will only affect fsl/, all other platforms set the formats field to 0 now.
--- sound/soc/soc-pcm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/soc-pcm.c +4 -1
@@ -240,7 +240,10 @@ static void soc_pcm_init_runtime_hw(struct snd_pcm_runtime *runtime, cpu_stream->channels_min); hw->channels_max =min (codec_stream->channels_max, cpu_stream->channels_max); - hw->formats = codec_stream->formats & cpu_stream->formats; +if (hw->formats) + hw->formats &= codec_stream->formats & cpu_stream->formats; +else + hw->formats = codec_stream->formats & cpu_stream->formats; hw->rates = codec_stream->rates & cpu_stream->rates;if (codec_stream->rates & (SNDRV_PCM_RATE_KNOT |SNDRV_PCM_RATE_CONTINUOUS ))
Signature · 1 line
1.8.0
Re: [PATCH v2 11/11] ASoC: Allow PCMs to restrict the supported formats
Quoted 9 lines · Lars-Peter Clausen
Some DMA cores might add additional restrictions on which in memory audio formats can be supported by the compound sound card. If the PCM component specifies a set of formats it supports (by setting the formats field to non 0) take these into account when calculating the format set for the compound sound card.
Signed-off-by Lars-Peter Clausen <[email protected]>Cc Timur Tabi <[email protected]>Cc Shawn Guo <[email protected]>
For patches 4, 7, and 11:
Re: [PATCH v2 11/11] ASoC: Allow PCMs to restrict the supported formats
In reply to Lars-Peter ClausenQuoted 5 lines · Lars-Peter Clausen
Some DMA cores might add additional restrictions on which in memory audio formats can be supported by the compound sound card. If the PCM component specifies a set of formats it supports (by setting the formats field to non 0) take these into account when calculating the format set for the compound sound card.
Applied, thanks.
Quoted 2 lines · Lars-Peter Clausen
We have the same code for initializing the runtime pcm on both the playback and the capture path. Factor this out into a common helper function.
Applied, thanks.