| From 5cef99e5e5b1b91bdfbd201c0c5e2fe0ed755053 Mon Sep 17 00:00:00 2001 |
| From: Nicolin Chen <Guangyu.Chen@freescale.com> |
| Date: Thu, 24 Apr 2014 19:13:58 +0800 |
| Subject: ASoC: simple-card: Drop node->name checking |
| |
| 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> |
| (cherry picked from commit 50e6c718a1eb2ae6d05f22615d8268b026175a4a) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/generic/simple-card.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c |
| index 3f2e5807d7eb..383a4a18d51f 100644 |
| --- a/sound/soc/generic/simple-card.c |
| +++ b/sound/soc/generic/simple-card.c |
| @@ -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); |
| -- |
| 2.1.2 |
| |
