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 ---
Resend this patch.
sound/soc/generic/simple-card.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index d437c80..711d6a1 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -152,6 +152,10 @@ static int asoc_simple_card_parse_of(struct device_node *node, return ret; }
+ /* parsing the card name from DT */ + snd_soc_of_parse_card_name(&info->snd_card, + "simple-audio-card,name"); + /* CPU sub-node */ ret = -EINVAL; np = of_get_child_by_name(node, "simple-audio-card,cpu"); @@ -266,7 +270,8 @@ static int asoc_simple_card_probe(struct platform_device *pdev) /* * init snd_soc_card */ - cinfo->snd_card.name = cinfo->card; + if (!cinfo->snd_card.name) + cinfo->snd_card.name = cinfo->card; cinfo->snd_card.owner = THIS_MODULE; cinfo->snd_card.dai_link = &cinfo->snd_link; cinfo->snd_card.num_links = 1;