ASoC: core: Add support for DAI multicodec
Subsystems (3)
v6 cover ASoC: core: Add support for DAI multicodec
Hi Lars, Mark and Liam,
Here is the sixth, and hopefully the last, version of the multicodec series.
I've just removed the broken test I forgot to remove last time.
The series is based on asoc/for-next (v3.16-rc3).
Test and comments are welcome.
Thanks,
Benoit
v1: http://comments.gmane.org/gmane.linux.alsa.devel/120532
v2: http://comments.gmane.org/gmane.linux.alsa.devel/121024
- Split the first version in several patches.
- Remove the TDM fixup
v3:
- Fixed all the places that were not iterating over all the codecs.
- Change the structure and split it.
v4:
- Improve the TDM management
- Split the orginal patch in smaller chunks
- Ignore the CODEC to CODEC link case for the moment
- Add iteration for multicodecs everywhere
v5:
- Remove multicodec support for soc-compress
- Simplify the code a little thanks to Lars component series
v6:
- Remove a broken test in snd_soc_runtime_ignore_pmdown_time
Benoit Cousson (5):
ASoC: core: Add initial support for DAI multicodec
ASoC: pcm: Add support for DAI multicodec
ASoC: dapm: Add support for DAI multicodec
ASoC: compress: Prevent multicodec for compressed stream
ASoC: pcm: Add soc_dai_hw_params helper
include/sound/soc-dai.h | 4 + include/sound/soc.h | 17 ++ sound/soc/soc-compress.c | 5 + sound/soc/soc-core.c | 293 +++++++++++++++++-------- sound/soc/soc-dapm.c | 95 ++++---- sound/soc/soc-pcm.c | 555 ++++++++++++++++++++++++++++++++--------------- 6 files changed, 665 insertions(+), 304 deletions(-)
Signature · 1 line
1.9.1
PATCH v6 1/5 ASoC: core: Add initial support for DAI multicodec
DAI link assumes a one to one mapping between CPU DAI and CODEC. In some cases, the same CPU DAI can be connected to several codecs. This is the case for example, if you connect two mono codecs to the same I2S link in order to have a stereo card.
The current ASoC implementation does not allow such setup.
Add support for DAI links composed of a single CPU DAI and multiple CODECs. Sound cards have to pass the CODECs array in the corresponding DAI link through a new 'snd_soc_dai_link_component' struct. Each CODEC in this array is described in the same manner single CODEC DAIs are (either DT/OF node or codec_name).
Multi-codec links are not supported in the case of CODEC to CODEC links. Just print a warning if it happens.
Based on an original code done by Misael.
--- include/sound/soc-dai.h | 4 + include/sound/soc.h | 13 +++ sound/soc/soc-core.c | 293 +++++++++++++++++++++++++++++++++--------------- 3 files changed, 220 insertions(+), 90 deletions(-)
include/sound/soc-dai.h +4 -0
@@ -272,6 +272,10 @@ struct snd_soc_dai {struct snd_soc_codec *codec;struct snd_soc_component *component; +/* CODEC TDM slot masks and params (for fixup) */ +unsigned int tx_mask; +unsigned int rx_mask; +struct snd_soc_card *card;struct list_head list;
include/sound/soc.h +13 -0
@@ -846,6 +846,12 @@ struct snd_soc_platform_driver {int (*bespoke_trigger)(struct snd_pcm_substream *,int ); }; +struct snd_soc_dai_link_component { +const char *name; +const struct device_node *of_node; +const char *dai_name; +}; +struct snd_soc_platform {struct device *dev;const struct snd_soc_platform_driver *driver;
@@ -891,6 +897,10 @@ struct snd_soc_dai_link {const struct device_node *codec_of_node;/* You MUST specify the DAI name within the codec */ const char *codec_dai_name; + +struct snd_soc_dai_link_component *codecs; +unsigned int num_codecs; +/* * You MAY specify the link's platform/PCM/DMA driver, either by * device name, or by DT/OF node, but not both. Some forms of link
@@ -1089,6 +1099,9 @@ struct snd_soc_pcm_runtime {struct snd_soc_dai *codec_dai;struct snd_soc_dai *cpu_dai; +struct snd_soc_dai **codec_dais; +unsigned int num_codecs; +struct delayed_work delayed_work;#ifdef CONFIG_DEBUG_FS struct dentry *debugfs_dpcm_root;
sound/soc/soc-core.c +203 -90
504 lines not on this page · raw message
Signature · 1 line
1.9.1
Re: [PATCH v6 1/5] ASoC: core: Add initial support for DAI multicodec
Quoted 5 lines · Benoit Cousson
DAI link assumes a one to one mapping between CPU DAI and CODEC. In some cases, the same CPU DAI can be connected to several codecs. This is the case for example, if you connect two mono codecs to the same I2S link in order to have a stereo card.
The current ASoC implementation does not allow such setup.
Applied, thanks.
PATCH v6 2/5 ASoC: pcm: Add support for DAI multicodec
In reply to Benoit CoussonAdd multicodec support in soc-pcm.c
--- sound/soc/soc-pcm.c | 534 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 368 insertions(+), 166 deletions(-)
sound/soc/soc-pcm.c +368 -166
@@ -47,22 +47,26 @@void snd_soc_runtime_activate (struct snd_soc_pcm_runtime *rtd,int stream) {struct snd_soc_dai *cpu_dai = rtd->cpu_dai; -struct snd_soc_dai *codec_dai = rtd->codec_dai; +int i;lockdep_assert_held (&rtd->pcm_mutex);if (stream ==SNDRV_PCM_STREAM_PLAYBACK ) { cpu_dai->playback_active++; - codec_dai->playback_active++; +for (i =0 ; i < rtd->num_codecs; i++) + rtd->codec_dais[i]->playback_active++; }else { cpu_dai->capture_active++; - codec_dai->capture_active++; +for (i =0 ; i < rtd->num_codecs; i++) + rtd->codec_dais[i]->capture_active++; } cpu_dai->active++; - codec_dai->active++; cpu_dai->component->active++; - codec_dai->component->active++; +for (i =0 ; i < rtd->num_codecs; i++) { + rtd->codec_dais[i]->active++; + rtd->codec_dais[i]->component->active++; + } }/**
@@ -78,22 +82,26 @@ void snd_soc_runtime_activate(struct snd_soc_pcm_runtime *rtd, int stream)void snd_soc_runtime_deactivate (struct snd_soc_pcm_runtime *rtd,int stream) {struct snd_soc_dai *cpu_dai = rtd->cpu_dai; -struct snd_soc_dai *codec_dai = rtd->codec_dai; +int i;lockdep_assert_held (&rtd->pcm_mutex);if (stream ==SNDRV_PCM_STREAM_PLAYBACK ) { cpu_dai->playback_active--; - codec_dai->playback_active--; +for (i =0 ; i < rtd->num_codecs; i++) + rtd->codec_dais[i]->playback_active--; }else { cpu_dai->capture_active--; - codec_dai->capture_active--; +for (i =0 ; i < rtd->num_codecs; i++) + rtd->codec_dais[i]->capture_active--; } cpu_dai->active--; - codec_dai->active--; cpu_dai->component->active--; - codec_dai->component->active--; +for (i =0 ; i < rtd->num_codecs; i++) { + rtd->codec_dais[i]->component->active--; + rtd->codec_dais[i]->active--; + } }/**
@@ -107,11 +115,16 @@ void snd_soc_runtime_deactivate(struct snd_soc_pcm_runtime *rtd, int stream)*/ bool snd_soc_runtime_ignore_pmdown_time (struct snd_soc_pcm_runtime *rtd) { +int i; +bool ignore = true; +if (!rtd->pmdown_time || rtd->dai_link->ignore_pmdown_time)return true; -return rtd->cpu_dai->component->ignore_pmdown_time && - rtd->codec_dai->component->ignore_pmdown_time; +for (i =0 ; i < rtd->num_codecs; i++) + ignore &= rtd->codec_dais[i]->component->ignore_pmdown_time; + +return rtd->cpu_dai->component->ignore_pmdown_time && ignore; }/**
@@ -222,8 +235,7 @@ static int soc_pcm_params_symmetry(struct snd_pcm_substream *substream, {struct snd_soc_pcm_runtime *rtd = substream->private_data;struct snd_soc_dai *cpu_dai = rtd->cpu_dai; -struct snd_soc_dai *codec_dai = rtd->codec_dai; -unsigned int rate, channels, sample_bits, symmetry; +unsigned int rate, channels, sample_bits, symmetry, i; rate =params_rate (params); channels =params_channels (params);
@@ -231,8 +243,11 @@ static int soc_pcm_params_symmetry(struct snd_pcm_substream *substream,/* reject unmatched parameters when applying symmetry */ symmetry = cpu_dai->driver->symmetric_rates || - codec_dai->driver->symmetric_rates || rtd->dai_link->symmetric_rates; + +for (i =0 ; i < rtd->num_codecs; i++) + symmetry |= rtd->codec_dais[i]->driver->symmetric_rates; +if (symmetry && cpu_dai->rate && cpu_dai->rate != rate) {dev_err (rtd->dev,"ASoC: unmatched rate symmetry: %d - %d\n" , cpu_dai->rate, rate);
@@ -240,8 +255,11 @@ static int soc_pcm_params_symmetry(struct snd_pcm_substream *substream, } symmetry = cpu_dai->driver->symmetric_channels || - codec_dai->driver->symmetric_channels || rtd->dai_link->symmetric_channels; + +for (i =0 ; i < rtd->num_codecs; i++) + symmetry |= rtd->codec_dais[i]->driver->symmetric_channels; +if (symmetry && cpu_dai->channels && cpu_dai->channels != channels) {dev_err (rtd->dev,"ASoC: unmatched channel symmetry: %d - %d\n" , cpu_dai->channels, channels);
@@ -249,8 +267,11 @@ static int soc_pcm_params_symmetry(struct snd_pcm_substream *substream, } symmetry = cpu_dai->driver->symmetric_samplebits || - codec_dai->driver->symmetric_samplebits || rtd->dai_link->symmetric_samplebits; + +for (i =0 ; i < rtd->num_codecs; i++) + symmetry |= rtd->codec_dais[i]->driver->symmetric_samplebits; +if (symmetry && cpu_dai->sample_bits && cpu_dai->sample_bits != sample_bits) {dev_err (rtd->dev,"ASoC: unmatched sample bits symmetry: %d - %d\n" , cpu_dai->sample_bits, sample_bits);
@@ -264,15 +285,20 @@ static bool soc_pcm_has_symmetry(struct snd_pcm_substream *substream) {struct snd_soc_pcm_runtime *rtd = substream->private_data;struct snd_soc_dai_driver *cpu_driver = rtd->cpu_dai->driver; -struct snd_soc_dai_driver *codec_driver = rtd->codec_dai->driver;struct snd_soc_dai_link *link = rtd->dai_link; +unsigned int symmetry, i; + + symmetry = cpu_driver->symmetric_rates || link->symmetric_rates || + cpu_driver->symmetric_channels || link->symmetric_channels || + cpu_driver->symmetric_samplebits || link->symmetric_samplebits; -return cpu_driver->symmetric_rates || codec_driver->symmetric_rates || - link->symmetric_rates || cpu_driver->symmetric_channels || - codec_driver->symmetric_channels || link->symmetric_channels || - cpu_driver->symmetric_samplebits || - codec_driver->symmetric_samplebits || - link->symmetric_samplebits; +for (i =0 ; i < rtd->num_codecs; i++) + symmetry = symmetry || + rtd->codec_dais[i]->driver->symmetric_rates || + rtd->codec_dais[i]->driver->symmetric_channels || + rtd->codec_dais[i]->driver->symmetric_samplebits; + +return symmetry; }/*
@@ -284,9 +310,9 @@ static int sample_sizes[] = { 24, 32, }; -static void soc_pcm_set_msb (struct snd_pcm_substream *substream, -struct snd_soc_dai *dai,int bits) +static void soc_pcm_set_msb (struct snd_pcm_substream *substream,int bits) { +struct snd_soc_pcm_runtime *rtd = substream->private_data;int ret, i;if (!bits)
@@ -299,7 +325,7 @@ static void soc_pcm_set_msb(struct snd_pcm_substream *substream, ret =snd_pcm_hw_constraint_msbits (substream->runtime,0 , sample_sizes[i], bits);if (ret !=0 ) -dev_warn (dai->dev, +dev_warn (rtd->dev,"ASoC: Failed to set MSB %d/%d: %d\n" , bits, sample_sizes[i], ret); }
@@ -309,47 +335,95 @@ static void soc_pcm_apply_msb(struct snd_pcm_substream *substream) {struct snd_soc_pcm_runtime *rtd = substream->private_data;struct snd_soc_dai *cpu_dai = rtd->cpu_dai; -struct snd_soc_dai *codec_dai = rtd->codec_dai; +struct snd_soc_dai *codec_dai; +int i;unsigned int bits =0 , cpu_bits;if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { - bits = codec_dai->driver->playback.sig_bits; +for (i =0 ; i < rtd->num_codecs; i++) { + codec_dai = rtd->codec_dais[i]; +if (codec_dai->driver->playback.sig_bits ==0 ) { + bits =0 ; +break ; + } + bits =max (codec_dai->driver->playback.sig_bits, bits); + } cpu_bits = cpu_dai->driver->playback.sig_bits; }else { - bits = codec_dai->driver->capture.sig_bits; +for (i =0 ; i < rtd->num_codecs; i++) { + codec_dai = rtd->codec_dais[i]; +if (codec_dai->driver->playback.sig_bits ==0 ) { + bits =0 ; +break ; + } + bits =max (codec_dai->driver->capture.sig_bits, bits); + } cpu_bits = cpu_dai->driver->capture.sig_bits; } -soc_pcm_set_msb (substream, codec_dai, bits); -soc_pcm_set_msb (substream, cpu_dai, cpu_bits); +soc_pcm_set_msb (substream, bits); +soc_pcm_set_msb (substream, cpu_bits); } -static void soc_pcm_init_runtime_hw (struct snd_pcm_runtime *runtime, -struct snd_soc_pcm_stream *codec_stream, -struct snd_soc_pcm_stream *cpu_stream) +static void soc_pcm_init_runtime_hw (struct snd_pcm_substream *substream) { +struct snd_pcm_runtime *runtime = substream->runtime;struct snd_pcm_hardware *hw = &runtime->hw; +struct snd_soc_pcm_runtime *rtd = substream->private_data; +struct snd_soc_dai_driver *cpu_dai_drv = rtd->cpu_dai->driver; +struct snd_soc_dai_driver *codec_dai_drv; +struct snd_soc_pcm_stream *codec_stream; +struct snd_soc_pcm_stream *cpu_stream; +unsigned int chan_min =0 , chan_max =UINT_MAX ; +unsigned int rate_min =0 , rate_max =UINT_MAX ; +unsigned int rates =UINT_MAX ; +u64 formats =ULLONG_MAX ; +int i; - hw->channels_min =max (codec_stream->channels_min, - cpu_stream->channels_min); - hw->channels_max =min (codec_stream->channels_max, - cpu_stream->channels_max); -if (hw->formats) - hw->formats &= codec_stream->formats & cpu_stream->formats; +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) + cpu_stream = &cpu_dai_drv->playback;else - hw->formats = codec_stream->formats & cpu_stream->formats; - hw->rates =snd_pcm_rate_mask_intersect (codec_stream->rates, - cpu_stream->rates); + cpu_stream = &cpu_dai_drv->capture; - hw->rate_min =0 ; - hw->rate_max =UINT_MAX ; +/* first calculate min/max only for CODECs in the DAI link */ +for (i =0 ; i < rtd->num_codecs; i++) { + codec_dai_drv = rtd->codec_dais[i]->driver; +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) + codec_stream = &codec_dai_drv->playback; +else + codec_stream = &codec_dai_drv->capture; + chan_min =max (chan_min, codec_stream->channels_min); + chan_max =min (chan_max, codec_stream->channels_max); + rate_min =max (rate_min, codec_stream->rate_min); + rate_max =min_not_zero (rate_max, codec_stream->rate_max); + formats &= codec_stream->formats; + rates =snd_pcm_rate_mask_intersect (codec_stream->rates, rates); + } + +/* +* chan min/max cannot be enforced if there are multiple CODEC DAIs +* connected to a single CPU DAI, use CPU DAI's directly and let +* channel allocation be fixed up later +*/ +if (rtd->num_codecs >1 ) { + chan_min = cpu_stream->channels_min; + chan_max = cpu_stream->channels_max; + } + + hw->channels_min =max (chan_min, cpu_stream->channels_min); + hw->channels_max =min (chan_max, cpu_stream->channels_max); +if (hw->formats) + hw->formats &= formats & cpu_stream->formats; +else + hw->formats = formats & cpu_stream->formats; + hw->rates =snd_pcm_rate_mask_intersect (rates, cpu_stream->rates);snd_pcm_limit_hw_rates (runtime); hw->rate_min =max (hw->rate_min, cpu_stream->rate_min); - hw->rate_min =max (hw->rate_min, codec_stream->rate_min); + hw->rate_min =max (hw->rate_min, rate_min); hw->rate_max =min_not_zero (hw->rate_max, cpu_stream->rate_max); - hw->rate_max =min_not_zero (hw->rate_max, codec_stream->rate_max); + hw->rate_max =min_not_zero (hw->rate_max, rate_max); }/*
@@ -363,15 +437,16 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)struct snd_pcm_runtime *runtime = substream->runtime;struct snd_soc_platform *platform = rtd->platform;struct snd_soc_dai *cpu_dai = rtd->cpu_dai; -struct snd_soc_dai *codec_dai = rtd->codec_dai; -struct snd_soc_dai_driver *cpu_dai_drv = cpu_dai->driver; -struct snd_soc_dai_driver *codec_dai_drv = codec_dai->driver; -int ret =0 ; +struct snd_soc_dai *codec_dai; +const char *codec_dai_name ="multicodec" ; +int i, ret =0 ;pinctrl_pm_select_default_state (cpu_dai->dev); -pinctrl_pm_select_default_state (codec_dai->dev); +for (i =0 ; i < rtd->num_codecs; i++) +pinctrl_pm_select_default_state (rtd->codec_dais[i]->dev);pm_runtime_get_sync (cpu_dai->dev); -pm_runtime_get_sync (codec_dai->dev); +for (i =0 ; i < rtd->num_codecs; i++) +pm_runtime_get_sync (rtd->codec_dais[i]->dev);pm_runtime_get_sync (platform->dev);mutex_lock_nested (&rtd->pcm_mutex, rtd->pcm_subclass);
@@ -395,13 +470,23 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) } } -if (codec_dai->driver->ops && codec_dai->driver->ops->startup) { - ret = codec_dai->driver->ops->startup (substream, codec_dai); -if (ret <0 ) { -dev_err (codec_dai->dev,"ASoC: can't open codec" -" %s: %d\n" , codec_dai->name, ret); - goto codec_dai_err; +for (i =0 ; i < rtd->num_codecs; i++) { + codec_dai = rtd->codec_dais[i]; +if (codec_dai->driver->ops && codec_dai->driver->ops->startup) { + ret = codec_dai->driver->ops->startup (substream, + codec_dai); +if (ret <0 ) { +dev_err (codec_dai->dev, +"ASoC: can't open codec %s: %d\n" , + codec_dai->name, ret); + goto codec_dai_err; + } } + +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) + codec_dai->tx_mask =0 ; +else + codec_dai->rx_mask =0 ; }if (rtd->dai_link->ops && rtd->dai_link->ops->startup) {
@@ -418,13 +503,10 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) goto dynamic;/* Check that the codec and cpu DAIs are compatible */ -if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { -soc_pcm_init_runtime_hw (runtime, &codec_dai_drv->playback, - &cpu_dai_drv->playback); - }else { -soc_pcm_init_runtime_hw (runtime, &codec_dai_drv->capture, - &cpu_dai_drv->capture); - } +soc_pcm_init_runtime_hw (substream); + +if (rtd->num_codecs ==1 ) + codec_dai_name = rtd->codec_dai->name;if (soc_pcm_has_symmetry (substream)) runtime->hw.info |=SNDRV_PCM_INFO_JOINT_DUPLEX ;
@@ -432,18 +514,18 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) ret = -EINVAL ;if (!runtime->hw.rates) {printk (KERN_ERR "ASoC: %s <-> %s No matching rates\n" , - codec_dai->name, cpu_dai->name); + codec_dai_name, cpu_dai->name); goto config_err; }if (!runtime->hw.formats) {printk (KERN_ERR "ASoC: %s <-> %s No matching formats\n" , - codec_dai->name, cpu_dai->name); + codec_dai_name, cpu_dai->name); goto config_err; }if (!runtime->hw.channels_min || !runtime->hw.channels_max || runtime->hw.channels_min > runtime->hw.channels_max) {printk (KERN_ERR "ASoC: %s <-> %s No matching channels\n" , - codec_dai->name, cpu_dai->name); + codec_dai_name, cpu_dai->name); goto config_err; }
@@ -456,14 +538,17 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) goto config_err; } -if (codec_dai->active) { - ret =soc_pcm_apply_symmetry (substream, codec_dai); -if (ret !=0 ) - goto config_err; +for (i =0 ; i < rtd->num_codecs; i++) { +if (rtd->codec_dais[i]->active) { + ret =soc_pcm_apply_symmetry (substream, + rtd->codec_dais[i]); +if (ret !=0 ) + goto config_err; + } }pr_debug ("ASoC: %s <-> %s info:\n" , - codec_dai->name, cpu_dai->name); + codec_dai_name, cpu_dai->name);pr_debug ("ASoC: rate mask 0x%x\n" , runtime->hw.rates);pr_debug ("ASoC: min ch %d max ch %d\n" , runtime->hw.channels_min, runtime->hw.channels_max);
@@ -482,10 +567,15 @@ config_err: rtd->dai_link->ops->shutdown (substream); machine_err: -if (codec_dai->driver->ops->shutdown) - codec_dai->driver->ops->shutdown (substream, codec_dai); + i = rtd->num_codecs; codec_dai_err: +while (--i >=0 ) { + codec_dai = rtd->codec_dais[i]; +if (codec_dai->driver->ops->shutdown) + codec_dai->driver->ops->shutdown (substream, codec_dai); + } +if (platform->driver->ops && platform->driver->ops->close) platform->driver->ops->close (substream);
@@ -496,10 +586,13 @@ out:mutex_unlock (&rtd->pcm_mutex);pm_runtime_put (platform->dev); -pm_runtime_put (codec_dai->dev); +for (i =0 ; i < rtd->num_codecs; i++) +pm_runtime_put (rtd->codec_dais[i]->dev);pm_runtime_put (cpu_dai->dev); -if (!codec_dai->active) -pinctrl_pm_select_sleep_state (codec_dai->dev); +for (i =0 ; i < rtd->num_codecs; i++) { +if (!rtd->codec_dais[i]->active) +pinctrl_pm_select_sleep_state (rtd->codec_dais[i]->dev); + }if (!cpu_dai->active)pinctrl_pm_select_sleep_state (cpu_dai->dev);
@@ -515,7 +608,7 @@ static void close_delayed_work(struct work_struct *work) {struct snd_soc_pcm_runtime *rtd = container_of(work, struct snd_soc_pcm_runtime, delayed_work.work); -struct snd_soc_dai *codec_dai = rtd->codec_dai; +struct snd_soc_dai *codec_dai = rtd->codec_dais[0 ];mutex_lock_nested (&rtd->pcm_mutex, rtd->pcm_subclass);
@@ -544,7 +637,8 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)struct snd_soc_pcm_runtime *rtd = substream->private_data;struct snd_soc_platform *platform = rtd->platform;struct snd_soc_dai *cpu_dai = rtd->cpu_dai; -struct snd_soc_dai *codec_dai = rtd->codec_dai; +struct snd_soc_dai *codec_dai; +int i;mutex_lock_nested (&rtd->pcm_mutex, rtd->pcm_subclass);
@@ -554,14 +648,20 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)if (!cpu_dai->active) cpu_dai->rate =0 ; -if (!codec_dai->active) - codec_dai->rate =0 ; +for (i =0 ; i < rtd->num_codecs; i++) { + codec_dai = rtd->codec_dais[i]; +if (!codec_dai->active) + codec_dai->rate =0 ; + }if (cpu_dai->driver->ops->shutdown) cpu_dai->driver->ops->shutdown (substream, cpu_dai); -if (codec_dai->driver->ops->shutdown) - codec_dai->driver->ops->shutdown (substream, codec_dai); +for (i =0 ; i < rtd->num_codecs; i++) { + codec_dai = rtd->codec_dais[i]; +if (codec_dai->driver->ops->shutdown) + codec_dai->driver->ops->shutdown (substream, codec_dai); + }if (rtd->dai_link->ops && rtd->dai_link->ops->shutdown) rtd->dai_link->ops->shutdown (substream);
@@ -591,10 +691,13 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)mutex_unlock (&rtd->pcm_mutex);pm_runtime_put (platform->dev); -pm_runtime_put (codec_dai->dev); +for (i =0 ; i < rtd->num_codecs; i++) +pm_runtime_put (rtd->codec_dais[i]->dev);pm_runtime_put (cpu_dai->dev); -if (!codec_dai->active) -pinctrl_pm_select_sleep_state (codec_dai->dev); +for (i =0 ; i < rtd->num_codecs; i++) { +if (!rtd->codec_dais[i]->active) +pinctrl_pm_select_sleep_state (rtd->codec_dais[i]->dev); + }if (!cpu_dai->active)pinctrl_pm_select_sleep_state (cpu_dai->dev);
@@ -611,8 +714,8 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream)struct snd_soc_pcm_runtime *rtd = substream->private_data;struct snd_soc_platform *platform = rtd->platform;struct snd_soc_dai *cpu_dai = rtd->cpu_dai; -struct snd_soc_dai *codec_dai = rtd->codec_dai; -int ret =0 ; +struct snd_soc_dai *codec_dai; +int i, ret =0 ;mutex_lock_nested (&rtd->pcm_mutex, rtd->pcm_subclass);
@@ -634,12 +737,16 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream) } } -if (codec_dai->driver->ops && codec_dai->driver->ops->prepare) { - ret = codec_dai->driver->ops->prepare (substream, codec_dai); -if (ret <0 ) { -dev_err (codec_dai->dev,"ASoC: DAI prepare error: %d\n" , - ret); - goto out; +for (i =0 ; i < rtd->num_codecs; i++) { + codec_dai = rtd->codec_dais[i]; +if (codec_dai->driver->ops && codec_dai->driver->ops->prepare) { + ret = codec_dai->driver->ops->prepare (substream, + codec_dai); +if (ret <0 ) { +dev_err (codec_dai->dev, +"ASoC: DAI prepare error: %d\n" , ret); + goto out; + } } }
@@ -662,13 +769,26 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream)snd_soc_dapm_stream_event (rtd, substream->stream,SND_SOC_DAPM_STREAM_START ); -snd_soc_dai_digital_mute (codec_dai,0 , substream->stream); +for (i =0 ; i < rtd->num_codecs; i++) +snd_soc_dai_digital_mute (rtd->codec_dais[i],0 , + substream->stream); out:mutex_unlock (&rtd->pcm_mutex);return ret; } +static void soc_pcm_codec_params_fixup (struct snd_pcm_hw_params *params, +unsigned int mask) +{ +struct snd_interval *interval; +int channels =hweight_long (mask); + + interval =hw_param_interval (params,SNDRV_PCM_HW_PARAM_CHANNELS ); + interval->min = channels; + interval->max = channels; +} +/* * Called by ALSA when the hardware params are set by application. This * function can also be called multiple times and can allocate buffers
@@ -680,8 +800,7 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream,struct snd_soc_pcm_runtime *rtd = substream->private_data;struct snd_soc_platform *platform = rtd->platform;struct snd_soc_dai *cpu_dai = rtd->cpu_dai; -struct snd_soc_dai *codec_dai = rtd->codec_dai; -int ret =0 ; +int i, ret =0 ;mutex_lock_nested (&rtd->pcm_mutex, rtd->pcm_subclass);
@@ -698,13 +817,37 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, } } -if (codec_dai->driver->ops && codec_dai->driver->ops->hw_params) { - ret = codec_dai->driver->ops->hw_params (substream, params, codec_dai); -if (ret <0 ) { -dev_err (codec_dai->dev,"ASoC: can't set %s hw params:" -" %d\n" , codec_dai->name, ret); - goto codec_err; +for (i =0 ; i < rtd->num_codecs; i++) { +struct snd_soc_dai *codec_dai = rtd->codec_dais[i]; +struct snd_pcm_hw_params codec_params; + +/* copy params for each codec */ + codec_params = *params; + +/* fixup params based on TDM slot masks */ +if (codec_dai->tx_mask) +soc_pcm_codec_params_fixup (&codec_params, + codec_dai->tx_mask); +if (codec_dai->rx_mask) +soc_pcm_codec_params_fixup (&codec_params, + codec_dai->rx_mask); + +if (codec_dai->driver->ops && + codec_dai->driver->ops->hw_params) { + ret = codec_dai->driver->ops->hw_params (substream, + &codec_params, codec_dai); +if (ret <0 ) { +dev_err (codec_dai->dev, +"ASoC: can't set %s hw params: %d\n" , + codec_dai->name, ret); + goto codec_err; + } } + + codec_dai->rate =params_rate (&codec_params); + codec_dai->channels =params_channels (&codec_params); + codec_dai->sample_bits =snd_pcm_format_physical_width ( +params_format (&codec_params)); }if (cpu_dai->driver->ops && cpu_dai->driver->ops->hw_params) {
@@ -731,11 +874,6 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, cpu_dai->sample_bits =snd_pcm_format_physical_width (params_format (params)); - codec_dai->rate =params_rate (params); - codec_dai->channels =params_channels (params); - codec_dai->sample_bits = -snd_pcm_format_physical_width (params_format (params)); - out:mutex_unlock (&rtd->pcm_mutex);return ret;
@@ -745,10 +883,16 @@ platform_err: cpu_dai->driver->ops->hw_free (substream, cpu_dai); interface_err: -if (codec_dai->driver->ops && codec_dai->driver->ops->hw_free) - codec_dai->driver->ops->hw_free (substream, codec_dai); + i = rtd->num_codecs; codec_err: +while (--i >=0 ) { +struct snd_soc_dai *codec_dai = rtd->codec_dais[i]; +if (codec_dai->driver->ops && codec_dai->driver->ops->hw_free) + codec_dai->driver->ops->hw_free (substream, codec_dai); + codec_dai->rate =0 ; + } +if (rtd->dai_link->ops && rtd->dai_link->ops->hw_free) rtd->dai_link->ops->hw_free (substream);
@@ -764,8 +908,9 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream)struct snd_soc_pcm_runtime *rtd = substream->private_data;struct snd_soc_platform *platform = rtd->platform;struct snd_soc_dai *cpu_dai = rtd->cpu_dai; -struct snd_soc_dai *codec_dai = rtd->codec_dai; +struct snd_soc_dai *codec_dai;bool playback = substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ; +int i;mutex_lock_nested (&rtd->pcm_mutex, rtd->pcm_subclass);
@@ -776,16 +921,22 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream) cpu_dai->sample_bits =0 ; } -if (codec_dai->active ==1 ) { - codec_dai->rate =0 ; - codec_dai->channels =0 ; - codec_dai->sample_bits =0 ; +for (i =0 ; i < rtd->num_codecs; i++) { + codec_dai = rtd->codec_dais[i]; +if (codec_dai->active ==1 ) { + codec_dai->rate =0 ; + codec_dai->channels =0 ; + codec_dai->sample_bits =0 ; + } }/* apply codec digital mute */ -if ((playback && codec_dai->playback_active ==1 ) || - (!playback && codec_dai->capture_active ==1 )) -snd_soc_dai_digital_mute (codec_dai,1 , substream->stream); +for (i =0 ; i < rtd->num_codecs; i++) { +if ((playback && rtd->codec_dais[i]->playback_active ==1 ) || + (!playback && rtd->codec_dais[i]->capture_active ==1 )) +snd_soc_dai_digital_mute (rtd->codec_dais[i],1 , + substream->stream); + }/* free any machine hw params */ if (rtd->dai_link->ops && rtd->dai_link->ops->hw_free)
@@ -796,8 +947,11 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream) platform->driver->ops->hw_free (substream);/* now free hw params for the DAIs */ -if (codec_dai->driver->ops && codec_dai->driver->ops->hw_free) - codec_dai->driver->ops->hw_free (substream, codec_dai); +for (i =0 ; i < rtd->num_codecs; i++) { + codec_dai = rtd->codec_dais[i]; +if (codec_dai->driver->ops && codec_dai->driver->ops->hw_free) + codec_dai->driver->ops->hw_free (substream, codec_dai); + }if (cpu_dai->driver->ops && cpu_dai->driver->ops->hw_free) cpu_dai->driver->ops->hw_free (substream, cpu_dai);
@@ -811,13 +965,17 @@ static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd)struct snd_soc_pcm_runtime *rtd = substream->private_data;struct snd_soc_platform *platform = rtd->platform;struct snd_soc_dai *cpu_dai = rtd->cpu_dai; -struct snd_soc_dai *codec_dai = rtd->codec_dai; -int ret; - -if (codec_dai->driver->ops && codec_dai->driver->ops->trigger) { - ret = codec_dai->driver->ops->trigger (substream, cmd, codec_dai); -if (ret <0 ) -return ret; +struct snd_soc_dai *codec_dai; +int i, ret; + +for (i =0 ; i < rtd->num_codecs; i++) { + codec_dai = rtd->codec_dais[i]; +if (codec_dai->driver->ops && codec_dai->driver->ops->trigger) { + ret = codec_dai->driver->ops->trigger (substream, + cmd, codec_dai); +if (ret <0 ) +return ret; + } }if (platform->driver->ops && platform->driver->ops->trigger) {
@@ -847,14 +1005,18 @@ static int soc_pcm_bespoke_trigger(struct snd_pcm_substream *substream,struct snd_soc_pcm_runtime *rtd = substream->private_data;struct snd_soc_platform *platform = rtd->platform;struct snd_soc_dai *cpu_dai = rtd->cpu_dai; -struct snd_soc_dai *codec_dai = rtd->codec_dai; -int ret; - -if (codec_dai->driver->ops && - codec_dai->driver->ops->bespoke_trigger) { - ret = codec_dai->driver->ops->bespoke_trigger (substream, cmd, codec_dai); -if (ret <0 ) -return ret; +struct snd_soc_dai *codec_dai; +int i, ret; + +for (i =0 ; i < rtd->num_codecs; i++) { + codec_dai = rtd->codec_dais[i]; +if (codec_dai->driver->ops && + codec_dai->driver->ops->bespoke_trigger) { + ret = codec_dai->driver->ops->bespoke_trigger (substream, + cmd, codec_dai); +if (ret <0 ) +return ret; + } }if (platform->driver->bespoke_trigger) {
@@ -880,10 +1042,12 @@ static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream)struct snd_soc_pcm_runtime *rtd = substream->private_data;struct snd_soc_platform *platform = rtd->platform;struct snd_soc_dai *cpu_dai = rtd->cpu_dai; -struct snd_soc_dai *codec_dai = rtd->codec_dai; +struct snd_soc_dai *codec_dai;struct snd_pcm_runtime *runtime = substream->runtime;snd_pcm_uframes_t offset =0 ;snd_pcm_sframes_t delay =0 ; +snd_pcm_sframes_t codec_delay =0 ; +int i;if (platform->driver->ops && platform->driver->ops->pointer) offset = platform->driver->ops->pointer (substream);
@@ -891,11 +1055,21 @@ static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream)if (cpu_dai->driver->ops && cpu_dai->driver->ops->delay) delay += cpu_dai->driver->ops->delay (substream, cpu_dai); -if (codec_dai->driver->ops && codec_dai->driver->ops->delay) - delay += codec_dai->driver->ops->delay (substream, codec_dai); +for (i =0 ; i < rtd->num_codecs; i++) { + codec_dai = rtd->codec_dais[i]; +if (codec_dai->driver->ops && codec_dai->driver->ops->delay) + codec_delay =max (codec_delay, + codec_dai->driver->ops->delay (substream, + codec_dai)); + } + delay += codec_delay; +/* +* None of the existing platform drivers implement delay(), so +* for now the codec_dai of first multicodec entry is used +*/ if (platform->driver->delay) - delay += platform->driver->delay (substream, codec_dai); + delay += platform->driver->delay (substream, rtd->codec_dais[0 ]); runtime->delay = delay;
@@ -998,7 +1172,7 @@ static struct snd_soc_pcm_runtime *dpcm_get_be(struct snd_soc_card *card, struct snd_soc_dapm_widget *widget, int stream) {struct snd_soc_pcm_runtime *be; -int i; +int i, j;if (stream ==SNDRV_PCM_STREAM_PLAYBACK ) {for (i =0 ; i < card->num_links; i++) {
@@ -1007,9 +1181,14 @@ static struct snd_soc_pcm_runtime *dpcm_get_be(struct snd_soc_card *card,if (!be->dai_link->no_pcm)continue ; -if (be->cpu_dai->playback_widget == widget || - be->codec_dai->playback_widget == widget) +if (be->cpu_dai->playback_widget == widget)return be; + +for (j =0 ; j < be->num_codecs; j++) { +struct snd_soc_dai *dai = be->codec_dais[j]; +if (dai->playback_widget == widget) +return be; + } } }else {
@@ -1019,9 +1198,14 @@ static struct snd_soc_pcm_runtime *dpcm_get_be(struct snd_soc_card *card,if (!be->dai_link->no_pcm)continue ; -if (be->cpu_dai->capture_widget == widget || - be->codec_dai->capture_widget == widget) +if (be->cpu_dai->capture_widget == widget)return be; + +for (j =0 ; j < be->num_codecs; j++) { +struct snd_soc_dai *dai = be->codec_dais[j]; +if (dai->capture_widget == widget) +return be; + } } }
@@ -1084,6 +1268,7 @@ static int dpcm_prune_paths(struct snd_soc_pcm_runtime *fe, int stream,/* Destroy any old FE <--> BE connections */ list_for_each_entry (dpcm, &fe->dpcm[stream].be_clients, list_be) { +unsigned int i;/* is there a valid CPU DAI widget for this BE */ widget =dai_get_widget (dpcm->be->cpu_dai, stream);
@@ -1093,11 +1278,14 @@ static int dpcm_prune_paths(struct snd_soc_pcm_runtime *fe, int stream,continue ;/* is there a valid CODEC DAI widget for this BE */ - widget =dai_get_widget (dpcm->be->codec_dai, stream); +for (i =0 ; i < dpcm->be->num_codecs; i++) { +struct snd_soc_dai *dai = dpcm->be->codec_dais[i]; + widget =dai_get_widget (dai, stream); -/* prune the BE if it's no longer in our active list */ -if (widget &&widget_in_list (list, widget)) -continue ; +/* prune the BE if it's no longer in our active list */ +if (widget &&widget_in_list (list, widget)) +continue ; + } dev_dbg(fe->dev, "ASoC: pruning %s BE %s for %s\n", stream ? "capture" : "playback",
@@ -2127,16 +2315,22 @@ int soc_dpcm_be_digital_mute(struct snd_soc_pcm_runtime *fe, int mute)list_for_each_entry (dpcm, clients, list_be) {struct snd_soc_pcm_runtime *be = dpcm->be; -struct snd_soc_dai *dai = be->codec_dai; -struct snd_soc_dai_driver *drv = dai->driver; +int i;if (be->dai_link->ignore_suspend)continue ; -dev_dbg (be->dev,"ASoC: BE digital mute %s\n" , be->dai_link->name); +for (i =0 ; i < be->num_codecs; i++) { +struct snd_soc_dai *dai = be->codec_dais[i]; +struct snd_soc_dai_driver *drv = dai->driver; + +dev_dbg (be->dev,"ASoC: BE digital mute %s\n" , + be->dai_link->name); -if (drv->ops && drv->ops->digital_mute && dai->playback_active) - drv->ops->digital_mute (dai, mute); +if (drv->ops && drv->ops->digital_mute && + dai->playback_active) + drv->ops->digital_mute (dai, mute); + } }return 0 ;
@@ -2201,22 +2395,27 @@ static int dpcm_fe_dai_close(struct snd_pcm_substream *fe_substream)int soc_new_pcm (struct snd_soc_pcm_runtime *rtd,int num) {struct snd_soc_platform *platform = rtd->platform; -struct snd_soc_dai *codec_dai = rtd->codec_dai; +struct snd_soc_dai *codec_dai;struct snd_soc_dai *cpu_dai = rtd->cpu_dai;struct snd_pcm *pcm;char new_name[64 ];int ret =0 , playback =0 , capture =0 ; +int i;if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm) { playback = rtd->dai_link->dpcm_playback; capture = rtd->dai_link->dpcm_capture; }else { -if (codec_dai->driver->playback.channels_min && - cpu_dai->driver->playback.channels_min) - playback =1 ; -if (codec_dai->driver->capture.channels_min && - cpu_dai->driver->capture.channels_min) - capture =1 ; +for (i =0 ; i < rtd->num_codecs; i++) { + codec_dai = rtd->codec_dais[i]; +if (codec_dai->driver->playback.channels_min) + playback =1 ; +if (codec_dai->driver->capture.channels_min) + capture =1 ; + } + + capture = capture && cpu_dai->driver->capture.channels_min; + playback = playback && cpu_dai->driver->playback.channels_min; }if (rtd->dai_link->playback_only) {
@@ -2242,7 +2441,9 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) rtd->dai_link->stream_name); else snprintf(new_name, sizeof(new_name), "%s %s-%d", - rtd->dai_link->stream_name, codec_dai->name, num); + rtd->dai_link->stream_name, + (rtd->num_codecs >1 ) ? + "multicodec" : rtd->codec_dai->name, num); ret =snd_pcm_new (rtd->card->snd_card, new_name, num, playback, capture, &pcm);
@@ -2315,8 +2516,9 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) pcm->private_free = platform->driver->pcm_free; out: -dev_info (rtd->card->dev,"%s <-> %s mapping ok\n" , codec_dai->name, - cpu_dai->name); +dev_info (rtd->card->dev,"%s <-> %s mapping ok\n" , + (rtd->num_codecs >1 ) ?"multicodec" : rtd->codec_dai->name, + cpu_dai->name);return ret; }
Signature · 1 line
1.9.1
Re: [PATCH v6 2/5] ASoC: pcm: Add support for DAI multicodec
Quoted 1 line · Benoit Cousson
Add multicodec support in
soc-pcm.c
Applied, thanks.
PATCH v6 3/5 ASoC: dapm: Add support for DAI multicodec
In reply to Benoit CoussonAdd multicodec support in soc-dapm.c
--- sound/soc/soc-dapm.c | 67 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 20 deletions(-)
sound/soc/soc-dapm.c +47 -20
@@ -2084,12 +2084,8 @@ int snd_soc_dapm_mixer_update_power(struct snd_soc_dapm_context *dapm, }EXPORT_SYMBOL_GPL (snd_soc_dapm_mixer_update_power); -/* show dapm widget status in sys fs */ -static ssize_t dapm_widget_show (struct device *dev, -struct device_attribute *attr,char *buf) +static ssize_t dapm_widget_show_codec (struct snd_soc_codec *codec,char *buf) { -struct snd_soc_pcm_runtime *rtd =dev_get_drvdata (dev); -struct snd_soc_codec *codec =rtd->codec;struct snd_soc_dapm_widget *w;int count =0 ;char *state ="not set" ;
@@ -2142,6 +2138,21 @@ static ssize_t dapm_widget_show(struct device *dev,return count; } +/* show dapm widget status in sys fs */ +static ssize_t dapm_widget_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct snd_soc_pcm_runtime *rtd =dev_get_drvdata (dev); +int i, count =0 ; + +for (i =0 ; i < rtd->num_codecs; i++) { +struct snd_soc_codec *codec = rtd->codec_dais[i]->codec; + count +=dapm_widget_show_codec (codec, buf + count); + } + +return count; +} + static DEVICE_ATTR(dapm_widget, 0444, dapm_widget_show, NULL);int snd_soc_dapm_sys_add (struct device *dev)
@@ -3395,25 +3406,18 @@ int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card)return 0 ; } -void snd_soc_dapm_connect_dai_link_widgets (struct snd_soc_card *card) +static void dapm_connect_dai_link_widgets (struct snd_soc_card *card, +struct snd_soc_pcm_runtime *rtd) { -struct snd_soc_pcm_runtime *rtd = card->rtd; +struct snd_soc_dai *cpu_dai = rtd->cpu_dai;struct snd_soc_dapm_widget *sink, *source; -struct snd_soc_dai *cpu_dai, *codec_dai; +struct snd_soc_dapm_route r;int i; -/* for each BE DAI link... */ -for (i =0 ; i < card->num_rtd; i++) { - rtd = &card->rtd[i]; - cpu_dai = rtd->cpu_dai; - codec_dai = rtd->codec_dai; +memset (&r,0 ,sizeof (r)); -/* -* dynamic FE links have no fixed DAI mapping. -* CODEC<->CODEC links have no direct connection. -*/ -if (rtd->dai_link->dynamic || rtd->dai_link->params) -continue ; +for (i =0 ; i < rtd->num_codecs; i++) { +struct snd_soc_dai *codec_dai = rtd->codec_dais[i];/* there is no point in connecting BE DAI links with dummies */ if (snd_soc_dai_is_dummy(codec_dai) ||
@@ -3475,11 +3479,34 @@ static void soc_dapm_dai_stream_event(struct snd_soc_dai *dai, int stream, } } +void snd_soc_dapm_connect_dai_link_widgets (struct snd_soc_card *card) +{ +struct snd_soc_pcm_runtime *rtd = card->rtd; +int i; + +/* for each BE DAI link... */ +for (i =0 ; i < card->num_rtd; i++) { + rtd = &card->rtd[i]; + +/* +* dynamic FE links have no fixed DAI mapping. +* CODEC<->CODEC links have no direct connection. +*/ +if (rtd->dai_link->dynamic || rtd->dai_link->params) +continue ; + +dapm_connect_dai_link_widgets (card, rtd); + } +} +static void soc_dapm_stream_event (struct snd_soc_pcm_runtime *rtd,int stream,int event) { +int i; +soc_dapm_dai_stream_event (rtd->cpu_dai, stream, event); -soc_dapm_dai_stream_event (rtd->codec_dai, stream, event); +for (i =0 ; i < rtd->num_codecs; i++) +soc_dapm_dai_stream_event (rtd->codec_dais[i], stream, event);dapm_power_widgets (rtd->card, event); }
Signature · 1 line
1.9.1
Re: [PATCH v6 3/5] ASoC: dapm: Add support for DAI multicodec
Quoted 1 line · Benoit Cousson
Add multicodec support in
soc-dapm.c
Applied, thanks.
PATCH v6 4/5 ASoC: compress: Prevent multicodec for compressed stream
In reply to Benoit CoussonMultiple codecs does not make sense in the case of compressed stream.
Exit with error if it happens.
--- sound/soc/soc-compress.c | 5 +++++ 1 file changed, 5 insertions(+)
sound/soc/soc-compress.c +5 -0
@@ -629,6 +629,11 @@ int soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)char new_name[64 ];int ret =0 , direction =0 ; +if (rtd->num_codecs >1 ) { +dev_err (rtd->card->dev,"Multicodec not supported for compressed stream\n" ); +return -EINVAL ; + } +/* check client and interface hw capabilities */ snprintf (new_name,sizeof (new_name),"%s %s-%d" , rtd->dai_link->stream_name, codec_dai->name, num);
Signature · 1 line
1.9.1
Re: [PATCH v6 4/5] ASoC: compress: Prevent multicodec for compressed stream
Quoted 2 lines · Benoit Cousson
Multiple codecs does not make sense in the case of compressed stream.
Applied, thanks.
PATCH v6 5/5 ASoC: pcm: Add soc_dai_hw_params helper
In reply to Benoit CoussonAdd a function helper to factorize the hw_params code.
Suggested by Lars-Peter Clausen <[email protected]>
--- include/sound/soc.h | 4 ++++ sound/soc/soc-dapm.c | 28 ++++++++-------------------- sound/soc/soc-pcm.c | 43 ++++++++++++++++++++++++------------------- 3 files changed, 36 insertions(+), 39 deletions(-)
include/sound/soc.h +4 -0
@@ -436,6 +436,10 @@ int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream,int snd_soc_platform_trigger (struct snd_pcm_substream *substream,int cmd,struct snd_soc_platform *platform); +int soc_dai_hw_params (struct snd_pcm_substream *substream, +struct snd_pcm_hw_params *params, +struct snd_soc_dai *dai); +/* Jack reporting */ int snd_soc_jack_new (struct snd_soc_codec *codec,const char *id,int type,struct snd_soc_jack *jack);
sound/soc/soc-dapm.c +8 -20
@@ -3214,27 +3214,15 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,switch (event) {case SND_SOC_DAPM_PRE_PMU : -if (source->driver->ops && source->driver->ops->hw_params) { - substream.stream =SNDRV_PCM_STREAM_CAPTURE ; - ret = source->driver->ops->hw_params (&substream, - params, source); -if (ret !=0 ) { -dev_err (source->dev, -"ASoC: hw_params() failed: %d\n" , ret); - goto out; - } - } + substream.stream =SNDRV_PCM_STREAM_CAPTURE ; + ret =soc_dai_hw_params (&substream, params, source); +if (ret <0 ) + goto out; -if (sink->driver->ops && sink->driver->ops->hw_params) { - substream.stream =SNDRV_PCM_STREAM_PLAYBACK ; - ret = sink->driver->ops->hw_params (&substream, params, - sink); -if (ret !=0 ) { -dev_err (sink->dev, -"ASoC: hw_params() failed: %d\n" , ret); - goto out; - } - } + substream.stream =SNDRV_PCM_STREAM_PLAYBACK ; + ret =soc_dai_hw_params (&substream, params, sink); +if (ret <0 ) + goto out;break ;case SND_SOC_DAPM_POST_PMU :
sound/soc/soc-pcm.c +24 -19
61 lines not on this page · raw message
Signature · 1 line
1.9.1
Re: [PATCH v6 5/5] ASoC: pcm: Add soc_dai_hw_params helper
Quoted 3 lines · Benoit Cousson
Add a function helper to factorize the
hw_paramscode.Suggested by Lars-Peter Clausen <[email protected]>
Applied, thanks.
Hi all,
Quoted 9 lines · Benoit Cousson
Hi Lars, Mark and Liam,
Here is the sixth, and hopefully the last, version of the multicodec series.
I've just removed the broken test I forgot to remove last time.
The series is based on asoc/for-next (v3.16-rc3).
Test and comments are welcome.
Any comment on that version?
Thanks,
Benoit
Signature · 4 lines
Benoît Cousson BayLibre Embedded Linux Technology Lab www.baylibre.com
Quoted 7 lines · Benoit Cousson
Hi all,
Quoted 4 lines · Benoit Cousson
Hi Lars, Mark and Liam,
Here is the sixth, and hopefully the last, version of the multicodec series.
Quoted 7 lines
Quoted 5 lines
I've just removed the broken test I forgot to remove last time.
The series is based on asoc/for-next (v3.16-rc3).
Test and comments are welcome.
Any comment on that version?
No comments is probably a good sign in this case. There is just a lot of activity on the ALSA mailinglist and lots of patches to review and this is a quite invasive patchset so it requires a bit more thorough review. Give it maybe two or three weeks. I'm quite confident that this version has a good chance of being merged.
- Lars
Mark Brown
maintainerQuoted 9 lines · Lars-Peter Clausen
Quoted 1 line · Benoit Cousson
Any comment on that version?
No comments is probably a good sign in this case. There is just a lot of activity on the ALSA mailinglist and lots of patches to review and this is a quite invasive patchset so it requires a bit more thorough review. Give it maybe two or three weeks. I'm quite confident that this version has a good chance of being merged.
Right, if you make multi-hundred line changes to most of the core files it shouldn't be that surprising if it gets some careful review! Anyway, that should be everything merged now - thanks for stepping up and doing this, it's something people have been looking for for years.
Hi Mark and Lars,
Quoted 5 lines · Mark Brown
Quoted 3 lines · Lars-Peter Clausen
Quoted 1 line · Benoit Cousson
Any comment on that version?
Quoted 8 lines
Quoted 5 lines
No comments is probably a good sign in this case. There is just a lot of activity on the ALSA mailinglist and lots of patches to review and this is a quite invasive patchset so it requires a bit more thorough review. Give it maybe two or three weeks. I'm quite confident that this version has a good chance of being merged.
Right, if you make multi-hundred line changes to most of the core files it shouldn't be that surprising if it gets some careful review!
Sorry, I perfectly understand and did not mean to push you.
Since the series was quite intrusive, I was just expecting some more feedbacks from hackers complaining about regression on their audio system. So I was just surprised to not get any of that :-)
Quoted 3 lines
Anyway,
that should be everything merged now - thanks for stepping up and doing this, it's something people have been looking for for years.
You're welcome. And thanks a lot to Lars who was really helpful to help me getting the series ready for upstream.
I owe him a couple of beers if I can meet him at ELC-E / LPC :-)
Thanks,
Benoit
Signature · 4 lines
Benoît Cousson BayLibre Embedded Linux Technology Lab www.baylibre.com