* [PATCHv2] ASoC: simple-card: Add snd_card's name parsing from DT node support
@ 2014-01-16 6:17 Xiubo Li
0 siblings, 0 replies; only message in thread
From: Xiubo Li @ 2014-01-16 6:17 UTC (permalink / raw)
To: broonie, lgirdwood, rientjes
Cc: kuninori.morimoto.gx, alsa-devel, linux-kernel, Xiubo Li
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;
--
1.8.4
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-01-16 7:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-16 6:17 [PATCHv2] ASoC: simple-card: Add snd_card's name parsing from DT node support Xiubo Li
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®