Skip to content

Commit

Permalink
ASoC: add snd_soc_of_get_dai_name() default of_xlate
Browse files Browse the repository at this point in the history
Current snd_soc_of_get_dai_name() needs .of_xlate_dai_name()
callback on each component drivers.
But required behavior on almost all these drivers is
just returns its indexed driver's name.

This patch adds this feature as default behavior.
.of_xlate_dai_name() can overwrite it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Oct 17, 2013
1 parent 7cc302d commit 6833c45
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 5 deletions.
4 changes: 3 additions & 1 deletion include/sound/soc.h
Original file line number Diff line number Diff line change
Expand Up @@ -644,10 +644,12 @@ struct snd_soc_component_driver {
struct snd_soc_component {
const char *name;
int id;
int num_dai;
struct device *dev;
struct list_head list;

struct snd_soc_dai_driver *dai_drv;
int num_dai;

const struct snd_soc_component_driver *driver;
};

Expand Down
28 changes: 24 additions & 4 deletions sound/soc/soc-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -4023,6 +4023,7 @@ __snd_soc_register_component(struct device *dev,

cmpnt->dev = dev;
cmpnt->driver = cmpnt_drv;
cmpnt->dai_drv = dai_drv;
cmpnt->num_dai = num_dai;

/*
Expand Down Expand Up @@ -4548,12 +4549,31 @@ int snd_soc_of_get_dai_name(struct device_node *of_node,
if (pos->dev->of_node != args.np)
continue;

if (!pos->driver->of_xlate_dai_name) {
ret = -ENOSYS;
break;
if (pos->driver->of_xlate_dai_name) {
ret = pos->driver->of_xlate_dai_name(pos, &args, dai_name);
} else {
int id = -1;

switch (args.args_count) {
case 0:
id = 0; /* same as dai_drv[0] */
break;
case 1:
id = args.args[0];
break;
default:
/* not supported */
break;
}

if (id < 0 || id >= pos->num_dai) {
ret = -EINVAL;
} else {
*dai_name = pos->dai_drv[id].name;
ret = 0;
}
}

ret = pos->driver->of_xlate_dai_name(pos, &args, dai_name);
break;
}
mutex_unlock(&client_mutex);
Expand Down

0 comments on commit 6833c45

Please sign in to comment.