Skip to content

Commit

Permalink
ASoC: simple-card: Drop node->name checking
Browse files Browse the repository at this point in the history
The current simple-card driver limits the DT node name to "sound".
Any of other names is forbidden while actually we should allow DT
to pass other node names.

And if this function is being called, the node must already have
the compatible "simple-audio-card" in DTB. So there should be no
need to check the name here.

Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Nicolin Chen authored and Mark Brown committed Apr 24, 2014
1 parent b3ca11f commit 50e6c71
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions sound/soc/generic/simple-card.c
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,7 @@ static int simple_card_dai_link_of(struct device_node *node,
char *prefix = "";
int ret;

if (!strcmp("sound", node->name))
prefix = "simple-audio-card,";
prefix = "simple-audio-card,";

daifmt = snd_soc_of_parse_daifmt(node, prefix,
&bitclkmaster, &framemaster);
Expand Down

0 comments on commit 50e6c71

Please sign in to comment.