ALSA: core: Constify the name in new kcontrols
Subsystems (3)
PATCH 1/8 ALSA: core: Constify the name in new kcontrols
We never modify it and this lets us use a const string as the name without warnings.
--- include/sound/control.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
include/sound/control.h +1 -1
@@ -40,7 +40,7 @@ struct snd_kcontrol_new {snd_ctl_elem_iface_t iface;/* interface identifier */ unsigned int device;/* device/client number */ unsigned int subdevice;/* subdevice (substream) number */ -unsigned char *name;/* ASCII name of item */ +const unsigned char *name;/* ASCII name of item */ unsigned int index;/* index of item */ unsigned int access;/* access rights */ unsigned int count;/* count of same elements */
Signature · 1 line
1.7.9.rc1
PATCH 2/8 ASoC: dapm: Unexport snd_soc_dapm_new_control()
Everything now uses snd_soc_dapm_new_controls() instead so we don't need to make it part of the external API.
--- include/sound/soc-dapm.h | 2 -- sound/soc/soc-dapm.c | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-)
include/sound/soc-dapm.h +0 -2
@@ -352,8 +352,6 @@ int snd_soc_dapm_get_pin_switch(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *uncontrol);int snd_soc_dapm_put_pin_switch (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_value *uncontrol); -int snd_soc_dapm_new_control (struct snd_soc_dapm_context *dapm, -const struct snd_soc_dapm_widget *widget);int snd_soc_dapm_new_controls (struct snd_soc_dapm_context *dapm,const struct snd_soc_dapm_widget *widget,int num);
sound/soc/soc-dapm.c +2 -3
@@ -2710,8 +2710,8 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_put_pin_switch);* * Returns 0 for success else error. */ -int snd_soc_dapm_new_control (struct snd_soc_dapm_context *dapm, -const struct snd_soc_dapm_widget *widget) +static int snd_soc_dapm_new_control (struct snd_soc_dapm_context *dapm, +const struct snd_soc_dapm_widget *widget) {struct snd_soc_dapm_widget *w;size_t name_len;
@@ -2801,7 +2801,6 @@ int snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, w->connected =1 ;return 0 ; } -EXPORT_SYMBOL_GPL (snd_soc_dapm_new_control);/** * snd_soc_dapm_new_controls - create new dapm controls
Signature · 1 line
1.7.9.rc1
PATCH 3/8 ASoC: dapm: Refactor snd_soc_dapm_new_widget() to return the widget
In reply to Mark BrownLet the caller fiddle with the widget after we're done in order to facilitate further refactoring.
--- sound/soc/soc-dapm.c | 35 ++++++++++++++--------------------- 1 files changed, 14 insertions(+), 21 deletions(-)
sound/soc/soc-dapm.c +14 -21
@@ -2701,24 +2701,16 @@ int snd_soc_dapm_put_pin_switch(struct snd_kcontrol *kcontrol, }EXPORT_SYMBOL_GPL (snd_soc_dapm_put_pin_switch); -/** -* snd_soc_dapm_new_control - create new dapm control -* @dapm: DAPM context -* @widget: widget template -* -* Creates a new dapm control based upon the template. -* -* Returns 0 for success else error. -*/ -static int snd_soc_dapm_new_control (struct snd_soc_dapm_context *dapm, -const struct snd_soc_dapm_widget *widget) +static struct snd_soc_dapm_widget * +snd_soc_dapm_new_control (struct snd_soc_dapm_context *dapm, +const struct snd_soc_dapm_widget *widget) {struct snd_soc_dapm_widget *w;size_t name_len;int ret;if ((w =dapm_cnew_widget (widget)) ==NULL ) -return -ENOMEM ; +return NULL ;switch (w->id) {case snd_soc_dapm_regulator_supply:
@@ -2727,7 +2719,7 @@ static int snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, ret =PTR_ERR (w->priv);dev_err (dapm->dev,"Failed to request %s: %d\n" , w->name, ret); -return ret; +return NULL ; }break ;default :
@@ -2740,7 +2732,7 @@ static int snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, w->name =kmalloc (name_len,GFP_KERNEL );if (w->name ==NULL ) {kfree (w); -return -ENOMEM ; +return NULL ; }if (dapm->codec && dapm->codec->name_prefix) snprintf(w->name, name_len, "%s %s",
@@ -2799,7 +2791,7 @@ static int snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,/* machine layer set ups unconnected pins and insertions */ w->connected =1 ; -return 0 ; +return w; }/**
@@ -2816,15 +2808,16 @@ int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm, const struct snd_soc_dapm_widget *widget, int num) { - int i, ret; +struct snd_soc_dapm_widget *w; +int i;for (i =0 ; i < num; i++) { - ret =snd_soc_dapm_new_control (dapm, widget); -if (ret <0 ) { + w =snd_soc_dapm_new_control (dapm, widget); +if (!w) {dev_err (dapm->dev, -"ASoC: Failed to create DAPM control %s: %d\n" , - widget->name, ret); -return ret; +"ASoC: Failed to create DAPM control %s\n" , + widget->name); +return -ENOMEM ; } widget++; }
Signature · 1 line
1.7.9.rc1
PATCH 4/8 ASoC: dapm: Supply the DAI and substream when calling stream events
In reply to Mark BrownIn order to allow us to do something smarter than iterate through widgets doing strcmp() to work out what to power up for stream events change the interface used to generate them to be based on the combination of a DAI and a stream direction rather than just a simple string identifying the stream.
At some point we'll probably want a set of channels too.
--- include/sound/soc-dapm.h | 4 ++-- sound/soc/soc-core.c | 30 ++++++++++++++++-------------- sound/soc/soc-dapm.c | 25 ++++++++++++++++--------- sound/soc/soc-pcm.c | 25 +++++++++---------------- 4 files changed, 43 insertions(+), 41 deletions(-)
include/sound/soc-dapm.h +2 -2
@@ -365,8 +365,8 @@ int snd_soc_dapm_weak_routes(struct snd_soc_dapm_context *dapm, const struct snd_soc_dapm_route *route, int num);/* dapm events */ -int snd_soc_dapm_stream_event (struct snd_soc_pcm_runtime *rtd, -const char *stream,int event); +int snd_soc_dapm_stream_event (struct snd_soc_pcm_runtime *rtd,int stream, +struct snd_soc_dai *dai,int event);void snd_soc_dapm_shutdown (struct snd_soc_card *card);/* external DAPM widget events */
sound/soc/soc-core.c +16 -14
@@ -573,18 +573,20 @@ int snd_soc_suspend(struct device *dev) }for (i =0 ; i < card->num_rtd; i++) { -struct snd_soc_dai_driver *driver = card->rtd[i].codec_dai->driver; +struct snd_soc_dai *codec_dai = card->rtd[i].codec_dai;if (card->rtd[i].dai_link->ignore_suspend)continue ; -if (driver->playback.stream_name !=NULL ) -snd_soc_dapm_stream_event (&card->rtd[i], driver->playback.stream_name, -SND_SOC_DAPM_STREAM_SUSPEND ); +snd_soc_dapm_stream_event (&card->rtd[i], +SNDRV_PCM_STREAM_PLAYBACK , + codec_dai, +SND_SOC_DAPM_STREAM_SUSPEND ); -if (driver->capture.stream_name !=NULL ) -snd_soc_dapm_stream_event (&card->rtd[i], driver->capture.stream_name, -SND_SOC_DAPM_STREAM_SUSPEND ); +snd_soc_dapm_stream_event (&card->rtd[i], +SNDRV_PCM_STREAM_CAPTURE , + codec_dai, +SND_SOC_DAPM_STREAM_SUSPEND ); }/* suspend all CODECs */
@@ -687,18 +689,18 @@ static void soc_resume_deferred(struct work_struct *work) }for (i =0 ; i < card->num_rtd; i++) { -struct snd_soc_dai_driver *driver = card->rtd[i].codec_dai->driver; +struct snd_soc_dai *codec_dai = card->rtd[i].codec_dai;if (card->rtd[i].dai_link->ignore_suspend)continue ; -if (driver->playback.stream_name !=NULL ) -snd_soc_dapm_stream_event (&card->rtd[i], driver->playback.stream_name, -SND_SOC_DAPM_STREAM_RESUME ); +snd_soc_dapm_stream_event (&card->rtd[i], +SNDRV_PCM_STREAM_PLAYBACK , codec_dai, +SND_SOC_DAPM_STREAM_RESUME ); -if (driver->capture.stream_name !=NULL ) -snd_soc_dapm_stream_event (&card->rtd[i], driver->capture.stream_name, -SND_SOC_DAPM_STREAM_RESUME ); +snd_soc_dapm_stream_event (&card->rtd[i], +SNDRV_PCM_STREAM_CAPTURE , codec_dai, +SND_SOC_DAPM_STREAM_RESUME ); }/* unmute any active DACs */
sound/soc/soc-dapm.c +16 -9
@@ -2826,17 +2826,27 @@ int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm,EXPORT_SYMBOL_GPL (snd_soc_dapm_new_controls);static void soc_dapm_stream_event (struct snd_soc_dapm_context *dapm, -const char *stream,int event) +int stream,struct snd_soc_dai *dai, +int event) {struct snd_soc_dapm_widget *w; +const char *stream_name; + +if (stream ==SNDRV_PCM_STREAM_PLAYBACK ) + stream_name = dai->driver->playback.stream_name; +else + stream_name = dai->driver->capture.stream_name; + +if (!stream_name) +return ;list_for_each_entry (w, &dapm->card->widgets, list) {if (!w->sname || w->dapm != dapm)continue ;dev_vdbg (w->dapm->dev,"widget %s\n %s stream %s event %d\n" , - w->name, w->sname, stream, event); -if (strstr (w->sname, stream)) { + w->name, w->sname, stream_name, event); +if (strstr (w->sname, stream_name)) {dapm_mark_dirty (w,"stream event" );switch (event) {case SND_SOC_DAPM_STREAM_START :
@@ -2868,16 +2878,13 @@ static void soc_dapm_stream_event(struct snd_soc_dapm_context *dapm,* * Returns 0 for success else error. */ -int snd_soc_dapm_stream_event (struct snd_soc_pcm_runtime *rtd, -const char *stream,int event) +int snd_soc_dapm_stream_event (struct snd_soc_pcm_runtime *rtd,int stream, +struct snd_soc_dai *dai,int event) {struct snd_soc_codec *codec = rtd->codec; -if (stream ==NULL ) -return 0 ; -mutex_lock (&codec->mutex); -soc_dapm_stream_event (&codec->dapm, stream, event); +soc_dapm_stream_event (&codec->dapm, stream, dai, event);mutex_unlock (&codec->mutex);return 0 ; }
sound/soc/soc-pcm.c +9 -16
@@ -307,9 +307,8 @@ static void close_delayed_work(struct work_struct *work)/* are we waiting on this codec DAI stream */ if (codec_dai->pop_wait ==1 ) { codec_dai->pop_wait =0 ; -snd_soc_dapm_stream_event (rtd, - codec_dai->driver->playback.stream_name, -SND_SOC_DAPM_STREAM_STOP ); +snd_soc_dapm_stream_event (rtd,SNDRV_PCM_STREAM_PLAYBACK , + codec_dai,SND_SOC_DAPM_STREAM_STOP ); }mutex_unlock (&rtd->pcm_mutex);
@@ -373,8 +372,9 @@ static int soc_pcm_close(struct snd_pcm_substream *substream) rtd->dai_link->ignore_pmdown_time) { /* powered down playback stream now */ snd_soc_dapm_stream_event(rtd, - codec_dai->driver->playback.stream_name, - SND_SOC_DAPM_STREAM_STOP); + SNDRV_PCM_STREAM_PLAYBACK, + codec_dai, + SND_SOC_DAPM_STREAM_STOP); } else {/* start delayed pop wq here for playback streams */ codec_dai->pop_wait =1 ;
@@ -383,9 +383,8 @@ static int soc_pcm_close(struct snd_pcm_substream *substream) } }else {/* capture streams can be powered down now */ -snd_soc_dapm_stream_event (rtd, - codec_dai->driver->capture.stream_name, -SND_SOC_DAPM_STREAM_STOP ); +snd_soc_dapm_stream_event (rtd,SNDRV_PCM_STREAM_CAPTURE , + codec_dai,SND_SOC_DAPM_STREAM_STOP ); }mutex_unlock (&rtd->pcm_mutex);
@@ -454,14 +453,8 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream)cancel_delayed_work (&rtd->delayed_work); } -if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) -snd_soc_dapm_stream_event (rtd, - codec_dai->driver->playback.stream_name, -SND_SOC_DAPM_STREAM_START ); -else -snd_soc_dapm_stream_event (rtd, - codec_dai->driver->capture.stream_name, -SND_SOC_DAPM_STREAM_START ); +snd_soc_dapm_stream_event (rtd, substream->stream, codec_dai, +SND_SOC_DAPM_STREAM_START );snd_soc_dai_digital_mute (codec_dai,0 );
Signature · 1 line
1.7.9.rc1
PATCH 5/8 ASoC: dapm: Constify lots of names that are never modified
In reply to Mark BrownNeater and avoids warnings when used in other places where const strings are desired.
--- include/sound/soc-dapm.h | 8 ++++---- include/sound/soc.h | 2 +- sound/soc/soc-core.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-)
include/sound/soc-dapm.h +4 -4
@@ -445,8 +445,8 @@ struct snd_soc_dapm_route {/* dapm audio path between two widgets */ struct snd_soc_dapm_path { -char *name; -char *long_name; +const char *name; +const char *long_name;/* source (input) and sink (output) widgets */ struct snd_soc_dapm_widget *source;
@@ -469,8 +469,8 @@ struct snd_soc_dapm_path {/* dapm widget */ struct snd_soc_dapm_widget {enum snd_soc_dapm_type id; -char *name;/* widget name */ -char *sname;/* stream name */ +const char *name;/* widget name */ +const char *sname;/* stream name */ struct snd_soc_codec *codec;struct snd_soc_platform *platform;struct list_head list;
include/sound/soc.h +1 -1
@@ -373,7 +373,7 @@ void snd_soc_free_ac97_codec(struct snd_soc_codec *codec);*Controls */ struct snd_kcontrol *snd_soc_cnew (const struct snd_kcontrol_new *_template, -void *data,char *long_name, +void *data,const char *long_name,const char *prefix);int snd_soc_add_codec_controls (struct snd_soc_codec *codec,const struct snd_kcontrol_new *controls,int num_controls);
sound/soc/soc-core.c +1 -1
@@ -2018,7 +2018,7 @@ EXPORT_SYMBOL_GPL(snd_soc_set_runtime_hwparams);* Returns 0 for success, else error. */ struct snd_kcontrol *snd_soc_cnew (const struct snd_kcontrol_new *_template, -void *data,char *long_name, +void *data,const char *long_name,const char *prefix) {struct snd_kcontrol_new template;
Signature · 1 line
1.7.9.rc1
PATCH 6/8 ASoC: dapm: Implement and instantiate DAI widgets
In reply to Mark BrownIn order to allow us to do smarter things with DAI links create DAPM widgets which directly represent the DAIs in the DAPM graph. These are automatically created from the DAIs as we probe the card with references held in both directions between the widget and the DAI.
The widgets are not made available for direct instantiation by drivers, they are created automatically from the DAIs. Drivers should be updated to create stream routes using DAPM maps rather than by annotating AIF and DAC widgets with streams.
In order to ease transition to this model from existing drivers we automatically create DAPM routes between the DAI widgets and the existing stream widgets which are started and stopped by the DAI widgets, though the old stream handling mechanism is still in place. This also has the nice effect of removing non-DAPM devices as any device with a DAI acquires a widget automatically which will allow future simplifications to the core DAPM logic.
The intention is that in future the AIF and DAI widgets will gain the ability to interact such that we are able to manage activity on individual channels independantly rather than powering up and down the entire AIF as we do currently.
Currently we only generate these for CODECs, mostly as I have no systems with non-CODEC DAPM to integrate with. It should be a simple matter of programming to add the additional hookup for these.
--- include/sound/soc-dai.h | 4 ++ include/sound/soc-dapm.h | 4 ++ sound/soc/soc-core.c | 11 ++++ sound/soc/soc-dapm.c | 135 +++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 146 insertions(+), 8 deletions(-)
include/sound/soc-dai.h +4 -0
@@ -17,6 +17,7 @@#include <linux/list.h> struct snd_pcm_substream ; +struct snd_soc_dapm_widget ;/* * DAI hardware audio formats.
@@ -238,6 +239,9 @@ struct snd_soc_dai { unsigned char pop_wait:1; unsigned char probed:1; +struct snd_soc_dapm_widget *playback_widget; +struct snd_soc_dapm_widget *capture_widget; +/* DAI DMA data */ void *playback_dma_data;void *capture_dma_data;
include/sound/soc-dapm.h +4 -0
@@ -355,6 +355,9 @@ int snd_soc_dapm_put_pin_switch(struct snd_kcontrol *kcontrol,int snd_soc_dapm_new_controls (struct snd_soc_dapm_context *dapm,const struct snd_soc_dapm_widget *widget,int num); +int snd_soc_dapm_new_dai_widgets (struct snd_soc_dapm_context *dapm, +struct snd_soc_dai *dai); +int snd_soc_dapm_link_dai_widgets (struct snd_soc_card *card);/* dapm path setup */ int snd_soc_dapm_new_widgets (struct snd_soc_dapm_context *dapm);
@@ -425,6 +428,7 @@ enum snd_soc_dapm_type { snd_soc_dapm_aif_in,/* audio interface input */ snd_soc_dapm_aif_out,/* audio interface output */ snd_soc_dapm_siggen,/* signal generator */ + snd_soc_dapm_dai, /* link to DAI structure */ };/*
sound/soc/soc-core.c +11 -0
@@ -1010,6 +1010,7 @@ static int soc_probe_codec(struct snd_soc_card *card, {int ret =0 ;const struct snd_soc_codec_driver *driver = codec->driver; +struct snd_soc_dai *dai; codec->card = card; codec->dapm.card = card;
@@ -1024,6 +1025,14 @@ static int soc_probe_codec(struct snd_soc_card *card,snd_soc_dapm_new_controls (&codec->dapm, driver->dapm_widgets, driver->num_dapm_widgets); +/* Create DAPM widgets for each DAI stream */ +list_for_each_entry (dai, &dai_list, list) { +if (dai->dev != codec->dev) +continue ; + +snd_soc_dapm_new_dai_widgets (&codec->dapm, dai); + } + codec->dapm.idle_bias_off = driver->idle_bias_off;if (driver->probe) {
@@ -1500,6 +1509,8 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card) } } +snd_soc_dapm_link_dai_widgets (card); +if (card->controls)snd_soc_add_card_controls (card, card->controls, card->num_controls);
sound/soc/soc-dapm.c +127 -8
215 lines not on this page · raw message
Signature · 1 line
1.7.9.rc1
Re: [PATCH 6/8] ASoC: dapm: Implement and instantiate DAI widgets
Quoted 18 lines · Mark Brown
In order to allow us to do smarter things with DAI links create DAPM widgets which directly represent the DAIs in the DAPM graph. These are automatically created from the DAIs as we probe the card with references held in both directions between the widget and the DAI.
The widgets are not made available for direct instantiation by drivers, they are created automatically from the DAIs. Drivers should be updated to create stream routes using DAPM maps rather than by annotating AIF and DAC widgets with streams.
In order to ease transition to this model from existing drivers we automatically create DAPM routes between the DAI widgets and the existing stream widgets which are started and stopped by the DAI widgets, though the old stream handling mechanism is still in place. This also has the nice effect of removing non-DAPM devices as any device with a DAI acquires a widget automatically which will allow future simplifications to the core DAPM logic.
Quoted 8 lines
The intention is that in future the AIF and DAI widgets will gain the ability to interact such that we are able to manage activity on individual channels independantly rather than powering up and down the entire AIF as we do currently.
Currently we only generate these for CODECs, mostly as I have no systems with non-CODEC DAPM to integrate with. It should be a simple matter of programming to add the additional hookup for these.
If I understood right, then instead of creating AIF/ADCs for codec paths now we need to create the DAI widget for each path and associate that with the DAI, right.
I think I understood former (creating the dai widgets), but how does it get linked to the DAIs?
Also in dai widget would it make sense to add channel map and associate that with DAI?
Signature · 1 line
~Vinod
Re: [PATCH 6/8] ASoC: dapm: Implement and instantiate DAI widgets
Quoted 4 lines · Vinod Koul
Also in dai widget would it make sense to add channel map and associate that with DAI?
Yeah, I think that would work. I've already started some work on the channel mapping (just associating unique PCM channel masks with DAI widgets) but I do need to upstream dynamic PCM first !
Liam
Re: [PATCH 6/8] ASoC: dapm: Implement and instantiate DAI widgets
In reply to Vinod KoulQuoted 24 lines · Vinod Koul
Quoted 23 lines · Mark Brown
In order to allow us to do smarter things with DAI links create DAPM widgets which directly represent the DAIs in the DAPM graph. These are automatically created from the DAIs as we probe the card with references held in both directions between the widget and the DAI.
The widgets are not made available for direct instantiation by drivers, they are created automatically from the DAIs. Drivers should be updated to create stream routes using DAPM maps rather than by annotating AIF and DAC widgets with streams.
In order to ease transition to this model from existing drivers we automatically create DAPM routes between the DAI widgets and the existing stream widgets which are started and stopped by the DAI widgets, though the old stream handling mechanism is still in place. This also has the nice effect of removing non-DAPM devices as any device with a DAI acquires a widget automatically which will allow future simplifications to the core DAPM logic.
The intention is that in future the AIF and DAI widgets will gain the ability to interact such that we are able to manage activity on individual channels independantly rather than powering up and down the entire AIF as we do currently.
Quoted 8 lines
Quoted 3 lines
Currently we only generate these for CODECs, mostly as I have no systems with non-CODEC DAPM to integrate with. It should be a simple matter of programming to add the additional hookup for these.
If I understood right, then instead of creating AIF/ADCs for codec paths now we need to create the DAI widget for each path and associate that with the DAI, right.
I think I understood former (creating the dai widgets), but how does it get linked to the DAIs?
Ping...
Signature · 1 line
~Vinod
Re: [PATCH 6/8] ASoC: dapm: Implement and instantiate DAI widgets
Quoted 9 lines · Vinod Koul
Quoted 7 lines · Vinod Koul
Quoted 3 lines
Currently we only generate these for CODECs, mostly as I have no systems with non-CODEC DAPM to integrate with. It should be a simple matter of programming to add the additional hookup for these.
If I understood right, then instead of creating AIF/ADCs for codec paths now we need to create the DAI widget for each path and associate that with the DAI, right.
Wrong, these widgets are automatically generated.
Re: [PATCH 6/8] ASoC: dapm: Implement and instantiate DAI widgets
Quoted 1 line · Mark Brown
Wrong, these widgets are automatically generated.
Okay, looks like I got it completely wrong.
Quoted 1 line
From the patche set I can see that now DAIs will have playback widget
and capture widget which will be turned ON, And your changes show me that the AIF widgets you register in wm codec will now be treated as dai widgets.
So from a codec driver, how does these two get linked, who fills the playback_widget pointer in dais?
For a codec which has two DAIs and I register two AIFs how will you fill the respective dia widgets in the DAIs...
Signature · 1 line
~Vinod
Re: [PATCH 6/8] ASoC: dapm: Implement and instantiate DAI widgets
Quoted 5 lines · Vinod Koul
So from a codec driver, how does these two get linked, who fills the
playback_widgetpointer in dais?For a codec which has two DAIs and I register two AIFs how will you fill the respective dia widgets in the DAIs...
The core initialises everything when it creates the widgets...
Re: [PATCH 6/8] ASoC: dapm: Implement and instantiate DAI widgets
Quoted 9 lines · Mark Brown
Quoted 5 lines · Vinod Koul
So from a codec driver, how does these two get linked, who fills the
playback_widgetpointer in dais?For a codec which has two DAIs and I register two AIFs how will you fill the respective dia widgets in the DAIs...
The core initialises everything when it creates the widgets...
Looks like I am completely on tangent here :(
Sorry but I am not able to comprehend how the core created playback and capture widget in the dai, which would be now used to trigger the stream_event instead of stream name is being associated with DAPM map.
Earlier we would check the stream_name and find the widgets corresponding to this and power up, how exactly would it work now :)
Signature · 1 line
~Vinod
Re: [PATCH 6/8] ASoC: dapm: Implement and instantiate DAI widgets
Quoted 3 lines · Vinod Koul
Sorry but I am not able to comprehend how the core created playback and capture widget in the dai, which would be now used to trigger the
stream_eventinstead of stream name is being associated with DAPM map.
That was essentially the entire content of the patch you're replying to... the actual creation happens in snd_soc_dapm_new_dai_widgets().
Quoted 2 lines
Earlier we would check the
stream_nameand find the widgets corresponding to this and power up, how exactly would it work now :)
See "ASoC: dapm: Convert stream events to use DAI widgets".
PATCH 7/8 ASoC: dapm: Convert stream events to use DAI widgets
In reply to Mark BrownThis means we don't need to walk through every single widget in the system for each stream event which is a bit less silly.
--- sound/soc/soc-dapm.c | 43 +++++++++++++++++-------------------------- 1 files changed, 17 insertions(+), 26 deletions(-)
sound/soc/soc-dapm.c +17 -26
@@ -2949,38 +2949,29 @@ static void soc_dapm_stream_event(struct snd_soc_dapm_context *dapm, int event) {struct snd_soc_dapm_widget *w; -const char *stream_name;if (stream ==SNDRV_PCM_STREAM_PLAYBACK ) - stream_name = dai->driver->playback.stream_name; + w = dai->playback_widget;else - stream_name = dai->driver->capture.stream_name; + w = dai->capture_widget; -if (!stream_name) +if (!w)return ; -list_for_each_entry (w, &dapm->card->widgets, list) - { -if (!w->sname || w->dapm != dapm) -continue ; -dev_vdbg (w->dapm->dev,"widget %s\n %s stream %s event %d\n" , - w->name, w->sname, stream_name, event); -if (strstr (w->sname, stream_name)) { -dapm_mark_dirty (w,"stream event" ); -switch (event) { -case SND_SOC_DAPM_STREAM_START : - w->active =1 ; -break ; -case SND_SOC_DAPM_STREAM_STOP : - w->active =0 ; -break ; -case SND_SOC_DAPM_STREAM_SUSPEND : -case SND_SOC_DAPM_STREAM_RESUME : -case SND_SOC_DAPM_STREAM_PAUSE_PUSH : -case SND_SOC_DAPM_STREAM_PAUSE_RELEASE : -break ; - } - } +dapm_mark_dirty (w,"stream event" ); + +switch (event) { +case SND_SOC_DAPM_STREAM_START : + w->active =1 ; +break ; +case SND_SOC_DAPM_STREAM_STOP : + w->active =0 ; +break ; +case SND_SOC_DAPM_STREAM_SUSPEND : +case SND_SOC_DAPM_STREAM_RESUME : +case SND_SOC_DAPM_STREAM_PAUSE_PUSH : +case SND_SOC_DAPM_STREAM_PAUSE_RELEASE : +break ; }dapm_power_widgets (dapm, event);
Signature · 1 line
1.7.9.rc1
PATCH 8/8 ASoC: wm8994: Convert to use DAI widget routing rather than streams
In reply to Mark Brown--- sound/soc/codecs/wm8994.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-)
sound/soc/codecs/wm8994.c +14 -6
@@ -1473,17 +1473,17 @@ SND_SOC_DAPM_AIF_IN_E("AIF2DACR", NULL, 0, WM8994_POWER_MANAGEMENT_5, 12, 0, wm8958_aif_ev, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), -SND_SOC_DAPM_AIF_IN ("AIF1DACDAT" ,"AIF1 Playback" ,0 ,SND_SOC_NOPM ,0 ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF2DACDAT" ,"AIF2 Playback" ,0 ,SND_SOC_NOPM ,0 ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF1ADCDAT" ,"AIF1 Capture" ,0 ,SND_SOC_NOPM ,0 ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF2ADCDAT" ,"AIF2 Capture" ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_IN ("AIF1DACDAT" ,NULL ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_IN ("AIF2DACDAT" ,NULL ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_OUT ("AIF1ADCDAT" ,NULL ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_OUT ("AIF2ADCDAT" ,NULL ,0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_MUX ("AIF1DAC Mux" ,SND_SOC_NOPM ,0 ,0 , &aif1dac_mux),SND_SOC_DAPM_MUX ("AIF2DAC Mux" ,SND_SOC_NOPM ,0 ,0 , &aif2dac_mux),SND_SOC_DAPM_MUX ("AIF2ADC Mux" ,SND_SOC_NOPM ,0 ,0 , &aif2adc_mux), -SND_SOC_DAPM_AIF_IN ("AIF3DACDAT" ,"AIF3 Playback" ,0 ,SND_SOC_NOPM ,0 ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF3ADCDAT" ,"AIF3 Capture" ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_IN ("AIF3DACDAT" ,NULL ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_OUT ("AIF3ADCDAT" ,NULL ,0 ,SND_SOC_NOPM ,0 ,0 ), SND_SOC_DAPM_SUPPLY("TOCLK", WM8994_CLOCKING_1, 4, 0, NULL, 0),
@@ -1598,6 +1598,14 @@ static const struct snd_soc_dapm_route intercon[] = { { "TOCLK", NULL, "CLK_SYS" }, + { "AIF1DACDAT", NULL, "AIF1 Playback" }, + { "AIF2DACDAT", NULL, "AIF2 Playback" }, + { "AIF3DACDAT", NULL, "AIF3 Playback" }, + + { "AIF1 Capture", NULL, "AIF1ADCDAT" }, + { "AIF2 Capture", NULL, "AIF2ADCDAT" }, + { "AIF3 Capture", NULL, "AIF3ADCDAT" }, +/* AIF1 outputs */ { "AIF1ADC1L", NULL, "AIF1ADC1L Mixer" }, { "AIF1ADC1L Mixer", "ADC/DMIC Switch", "ADCL Mux" },
Signature · 1 line
1.7.9.rc1
Quoted 13 lines · Mark Brown
We never modify it and this lets us use a const string as the name without warnings.
Signed-off-by Mark Brown <[email protected]>--- include/sound/control.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)include/sound/control.h +0
-0
include/sound/control.h struct snd_kcontrol_new { · line 46
Quoted 8 lines
include/sound/control.h +1
-1@@ -40,7 +40,7 @@ struct snd_kcontrol_new {snd_ctl_elem_iface_t iface;/* interface identifier */ unsigned int device;/* device/client number */ unsigned int subdevice;/* subdevice (substream) number */ -unsigned char *name;/* ASCII name of item */ +const unsigned char *name;/* ASCII name of item */ unsigned int index;/* index of item */ unsigned int access;/* access rights */ unsigned int count;/* count of same elements */
All
I'll do some incremental updates for platform and ABE support.
Liam