| Message ID | 87zigphgjq.wl%kuninori.morimoto.gx@renesas.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Mar 13, 2017 at 05:53:12AM +0000, Kuninori Morimoto wrote: > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > Current asoc_simple_card_parse_card_name() detect [prefix]name, > but in generally, we uses "label" for user visible names. > This patch expand it to [prefix]label. > This patch also update simple-xx-card.txt which is using this feature > > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > --- > v3 -> v4 > > - new patch to expand name/labal > > .../devicetree/bindings/sound/simple-card.txt | 1 + > .../devicetree/bindings/sound/simple-scu-card.txt | 1 + > sound/soc/generic/simple-card-utils.c | 18 ++++++++++++++---- > 3 files changed, 16 insertions(+), 4 deletions(-) > > diff --git a/Documentation/devicetree/bindings/sound/simple-card.txt b/Documentation/devicetree/bindings/sound/simple-card.txt > index c7a9393..f34a810 100644 > --- a/Documentation/devicetree/bindings/sound/simple-card.txt > +++ b/Documentation/devicetree/bindings/sound/simple-card.txt > @@ -8,6 +8,7 @@ Required properties: > > Optional properties: > > +- simple-audio-card,label : see simple-audio-card,name Just "label". That's a standard property name. > - simple-audio-card,name : User specified audio sound card name, one string > property. > - simple-audio-card,widgets : Please refer to widgets.txt. > diff --git a/Documentation/devicetree/bindings/sound/simple-scu-card.txt b/Documentation/devicetree/bindings/sound/simple-scu-card.txt > index d6fe47e..01eb56e 100644 > --- a/Documentation/devicetree/bindings/sound/simple-scu-card.txt > +++ b/Documentation/devicetree/bindings/sound/simple-scu-card.txt > @@ -9,6 +9,7 @@ Required properties: > > Optional properties: > > +- simple-audio-card,label : see simple-audio-card,name Ditto. > - simple-audio-card,name : User specified audio sound card name, one string > property. > - simple-audio-card,cpu : CPU sub-node
diff --git a/Documentation/devicetree/bindings/sound/simple-card.txt b/Documentation/devicetree/bindings/sound/simple-card.txt index c7a9393..f34a810 100644 --- a/Documentation/devicetree/bindings/sound/simple-card.txt +++ b/Documentation/devicetree/bindings/sound/simple-card.txt @@ -8,6 +8,7 @@ Required properties: Optional properties: +- simple-audio-card,label : see simple-audio-card,name - simple-audio-card,name : User specified audio sound card name, one string property. - simple-audio-card,widgets : Please refer to widgets.txt. diff --git a/Documentation/devicetree/bindings/sound/simple-scu-card.txt b/Documentation/devicetree/bindings/sound/simple-scu-card.txt index d6fe47e..01eb56e 100644 --- a/Documentation/devicetree/bindings/sound/simple-scu-card.txt +++ b/Documentation/devicetree/bindings/sound/simple-scu-card.txt @@ -9,6 +9,7 @@ Required properties: Optional properties: +- simple-audio-card,label : see simple-audio-card,name - simple-audio-card,name : User specified audio sound card name, one string property. - simple-audio-card,cpu : CPU sub-node diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 4924575..4dfd9a2 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -82,14 +82,24 @@ int asoc_simple_card_parse_card_name(struct snd_soc_card *card, char *prefix) { char prop[128]; + char *names[] = { + "label", "name" + }; + int i; int ret; - snprintf(prop, sizeof(prop), "%sname", prefix); + if (!prefix) + prefix = ""; /* Parse the card name from DT */ - ret = snd_soc_of_parse_card_name(card, prop); - if (ret < 0) - return ret; + for (i = 0; i < ARRAY_SIZE(names); i++) { + snprintf(prop, sizeof(prop), "%s%s", prefix, names[i]); + ret = snd_soc_of_parse_card_name(card, prop); + if (ret < 0) + return ret; + if (card->name) + break; + } if (!card->name && card->dai_link) card->name = card->dai_link->name;