Skip to content

Commit

Permalink
ASoC: Move widgets from DAPM context to snd_soc_card
Browse files Browse the repository at this point in the history 
Decoupling widgets from DAPM context is required when extending the ASoC
core to cross-device paths. Even the list of widgets are now kept in
struct snd_soc_card, the widget listing in sysfs and debugs remain sorted
per device.

This patch makes possible to build cross-device paths but does not extend
yet the DAPM to handle codec bias and widget power changes of an another
device.

Cross-device paths are registered by listing the widgets from device A in
a map for device B. In case of conflicting widget names between the devices,
a uniform name prefix is needed to separate them. See commit ead9b91
"ASoC: Add optional name_prefix for kcontrol, widget and route names" for
help.

An example below shows a path that connects MONO out of A into Line In of B:

static const struct snd_soc_dapm_route mapA[] = {
	{"MONO", NULL, "DAC"},
};

static const struct snd_soc_dapm_route mapB[] = {
	{"Line In", NULL, "MONO"},
};

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Jarkko Nikula authored and Mark Brown committed Dec 15, 2010
1 parent 8ddab3f commit 97c866d
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 23 deletions.
2 changes: 1 addition & 1 deletion include/sound/soc-dapm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ struct snd_soc_dapm_widget {

/* DAPM context */
struct snd_soc_dapm_context {
struct list_head widgets;
int n_widgets; /* number of widgets in this context */
enum snd_soc_bias_level bias_level;
enum snd_soc_bias_level suspend_bias_level;
struct delayed_work delayed_work;
Expand Down
1 change: 1 addition & 0 deletions include/sound/soc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -661,6 +661,7 @@ struct snd_soc_card {
struct list_head platform_dev_list;
struct list_head dai_dev_list;

struct list_head widgets;
struct list_head paths;

#ifdef CONFIG_DEBUG_FS
Expand Down
4 changes: 3 additions & 1 deletion sound/soc/codecs/wm8960.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,9 @@ static int wm8960_add_widgets(struct snd_soc_codec *codec)
* list each time to find the desired power state do so now
* and save the result.
*/
list_for_each_entry(w, &codec->dapm.widgets, list) {
list_for_each_entry(w, &codec->card->widgets, list) {
if (w->dapm != &codec->dapm)
continue;
if (strcmp(w->name, "LOUT1 PGA") == 0)
wm8960->lout1 = w;
if (strcmp(w->name, "ROUT1 PGA") == 0)
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/soc-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1879,6 +1879,7 @@ static int soc_probe(struct platform_device *pdev)
INIT_LIST_HEAD(&card->dai_dev_list);
INIT_LIST_HEAD(&card->codec_dev_list);
INIT_LIST_HEAD(&card->platform_dev_list);
INIT_LIST_HEAD(&card->widgets);
INIT_LIST_HEAD(&card->paths);

soc_init_card_debugfs(card);
Expand Down Expand Up @@ -3481,7 +3482,6 @@ int snd_soc_register_codec(struct device *dev,
else
codec->compress_type = SND_SOC_FLAT_COMPRESSION;

INIT_LIST_HEAD(&codec->dapm.widgets);
codec->write = codec_drv->write;
codec->read = codec_drv->read;
codec->dapm.bias_level = SND_SOC_BIAS_OFF;
Expand Down
69 changes: 49 additions & 20 deletions sound/soc/soc-dapm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,9 @@ static int dapm_power_widgets(struct snd_soc_dapm_context *dapm, int event)
/* Check which widgets we need to power and store them in
* lists indicating if they should be powered up or down.
*/
list_for_each_entry(w, &dapm->widgets, list) {
list_for_each_entry(w, &card->widgets, list) {
if (w->dapm != dapm)
continue;
switch (w->id) {
case snd_soc_dapm_pre:
dapm_seq_insert(w, &down_list, dapm_down_seq);
Expand Down Expand Up @@ -978,7 +980,7 @@ static int dapm_power_widgets(struct snd_soc_dapm_context *dapm, int event)
/* If there are no DAPM widgets then try to figure out power from the
* event type.
*/
if (list_empty(&dapm->widgets)) {
if (!dapm->n_widgets) {
switch (event) {
case SND_SOC_DAPM_STREAM_START:
case SND_SOC_DAPM_STREAM_RESUME:
Expand Down Expand Up @@ -1145,8 +1147,8 @@ void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm)
if (!dapm->debugfs_dapm)
return;

list_for_each_entry(w, &dapm->widgets, list) {
if (!w->name)
list_for_each_entry(w, &dapm->card->widgets, list) {
if (!w->name || w->dapm != dapm)
continue;

d = debugfs_create_file(w->name, 0444,
Expand Down Expand Up @@ -1241,7 +1243,9 @@ static ssize_t dapm_widget_show(struct device *dev,
int count = 0;
char *state = "not set";

list_for_each_entry(w, &codec->dapm.widgets, list) {
list_for_each_entry(w, &codec->card->widgets, list) {
if (w->dapm != &codec->dapm)
continue;

/* only display widgets that burnm power */
switch (w->id) {
Expand Down Expand Up @@ -1303,7 +1307,9 @@ static void dapm_free_widgets(struct snd_soc_dapm_context *dapm)
struct snd_soc_dapm_widget *w, *next_w;
struct snd_soc_dapm_path *p, *next_p;

list_for_each_entry_safe(w, next_w, &dapm->widgets, list) {
list_for_each_entry_safe(w, next_w, &dapm->card->widgets, list) {
if (w->dapm != dapm)
continue;
list_del(&w->list);
/*
* remove source and sink paths associated to this widget.
Expand Down Expand Up @@ -1334,7 +1340,9 @@ static int snd_soc_dapm_set_pin(struct snd_soc_dapm_context *dapm,
{
struct snd_soc_dapm_widget *w;

list_for_each_entry(w, &dapm->widgets, list) {
list_for_each_entry(w, &dapm->card->widgets, list) {
if (w->dapm != dapm)
continue;
if (!strcmp(w->name, pin)) {
dev_dbg(w->dapm->dev, "dapm: pin %s = %d\n",
pin, status);
Expand Down Expand Up @@ -1370,6 +1378,7 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm,
{
struct snd_soc_dapm_path *path;
struct snd_soc_dapm_widget *wsource = NULL, *wsink = NULL, *w;
struct snd_soc_dapm_widget *wtsource = NULL, *wtsink = NULL;
const char *sink;
const char *control = route->control;
const char *source;
Expand All @@ -1389,17 +1398,28 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm,
source = route->source;
}

/* find src and dest widgets */
list_for_each_entry(w, &dapm->widgets, list) {

/*
* find src and dest widgets over all widgets but favor a widget from
* current DAPM context
*/
list_for_each_entry(w, &dapm->card->widgets, list) {
if (!wsink && !(strcmp(w->name, sink))) {
wsink = w;
wtsink = w;
if (w->dapm == dapm)
wsink = w;
continue;
}
if (!wsource && !(strcmp(w->name, source))) {
wsource = w;
wtsource = w;
if (w->dapm == dapm)
wsource = w;
}
}
/* use widget from another DAPM context if not found from this */
if (!wsink)
wsink = wtsink;
if (!wsource)
wsource = wtsource;

if (wsource == NULL || wsink == NULL)
return -ENODEV;
Expand Down Expand Up @@ -1537,7 +1557,7 @@ int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm)
{
struct snd_soc_dapm_widget *w;

list_for_each_entry(w, &dapm->widgets, list)
list_for_each_entry(w, &dapm->card->widgets, list)
{
if (w->new)
continue;
Expand Down Expand Up @@ -2037,12 +2057,13 @@ int snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
else
snprintf(w->name, name_len, "%s", widget->name);

dapm->n_widgets++;
w->dapm = dapm;
w->codec = dapm->codec;
INIT_LIST_HEAD(&w->sources);
INIT_LIST_HEAD(&w->sinks);
INIT_LIST_HEAD(&w->list);
list_add(&w->list, &dapm->widgets);
list_add(&w->list, &dapm->card->widgets);

/* machine layer set ups unconnected pins and insertions */
w->connected = 1;
Expand Down Expand Up @@ -2085,9 +2106,9 @@ static void soc_dapm_stream_event(struct snd_soc_dapm_context *dapm,
{
struct snd_soc_dapm_widget *w;

list_for_each_entry(w, &dapm->widgets, list)
list_for_each_entry(w, &dapm->card->widgets, list)
{
if (!w->sname)
if (!w->sname || w->dapm != dapm)
continue;
dev_dbg(w->dapm->dev, "widget %s\n %s stream %s event %d\n",
w->name, w->sname, stream, event);
Expand Down Expand Up @@ -2170,7 +2191,9 @@ int snd_soc_dapm_force_enable_pin(struct snd_soc_dapm_context *dapm,
{
struct snd_soc_dapm_widget *w;

list_for_each_entry(w, &dapm->widgets, list) {
list_for_each_entry(w, &dapm->card->widgets, list) {
if (w->dapm != dapm)
continue;
if (!strcmp(w->name, pin)) {
dev_dbg(w->dapm->dev,
"dapm: force enable pin %s\n", pin);
Expand Down Expand Up @@ -2235,7 +2258,9 @@ int snd_soc_dapm_get_pin_status(struct snd_soc_dapm_context *dapm,
{
struct snd_soc_dapm_widget *w;

list_for_each_entry(w, &dapm->widgets, list) {
list_for_each_entry(w, &dapm->card->widgets, list) {
if (w->dapm != dapm)
continue;
if (!strcmp(w->name, pin))
return w->connected;
}
Expand All @@ -2260,7 +2285,9 @@ int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm,
{
struct snd_soc_dapm_widget *w;

list_for_each_entry(w, &dapm->widgets, list) {
list_for_each_entry(w, &dapm->card->widgets, list) {
if (w->dapm != dapm)
continue;
if (!strcmp(w->name, pin)) {
w->ignore_suspend = 1;
return 0;
Expand Down Expand Up @@ -2291,7 +2318,9 @@ static void soc_dapm_shutdown_codec(struct snd_soc_dapm_context *dapm)
LIST_HEAD(down_list);
int powerdown = 0;

list_for_each_entry(w, &dapm->widgets, list) {
list_for_each_entry(w, &dapm->card->widgets, list) {
if (w->dapm != dapm)
continue;
if (w->power) {
dapm_seq_insert(w, &down_list, dapm_down_seq);
w->power = 0;
Expand Down

0 comments on commit 97c866d

Please sign in to comment.