Skip to content

Commit

Permalink
ASoC: simple-card: Add snd_card's name parsing from DT node support
Browse files Browse the repository at this point in the history
If the DT is used and the CPU DAI device has only one DAI, the card
name will be like :

ALSA device list:
0: 40031000.sai-sgtl5000

And this name maybe a little ugly to some customers, so here the
card name parsing from DT node is supported.

Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Xiubo Li authored and Mark Brown committed Feb 3, 2014
1 parent 30d0341 commit 2772555
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion sound/soc/generic/simple-card.c
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@ static int asoc_simple_card_parse_of(struct device_node *node,
char *name;
int ret;

/* parsing the card name from DT */
snd_soc_of_parse_card_name(&priv->snd_card, "simple-audio-card,name");

/* get CPU/CODEC common format via simple-audio-card,format */
priv->daifmt = snd_soc_of_parse_daifmt(node, "simple-audio-card,") &
(SND_SOC_DAIFMT_FORMAT_MASK | SND_SOC_DAIFMT_INV_MASK);
Expand Down Expand Up @@ -187,7 +190,8 @@ static int asoc_simple_card_parse_of(struct device_node *node,
GFP_KERNEL);
sprintf(name, "%s-%s", dai_link->cpu_dai_name,
dai_link->codec_dai_name);
priv->snd_card.name = name;
if (!priv->snd_card.name)
priv->snd_card.name = name;
dai_link->name = dai_link->stream_name = name;

/* simple-card assumes platform == cpu */
Expand Down

0 comments on commit 2772555

Please sign in to comment.