The simple-card's DAPM route maping is optional.
Signed-off-by: Xiubo Li <li.xi...@freescale.com>
---
Resend this patch.
sound/soc/generic/simple-card.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index c0d92813..33c816c 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -138,10 +138,12 @@ static int asoc_simple_card_parse_of(struct device_node
*node,
(SND_SOC_DAIFMT_FORMAT_MASK | SND_SOC_DAIFMT_INV_MASK);
/* DAPM routes */
- ret = snd_soc_of_parse_audio_routing(&info->snd_card,
+ if (of_property_read_bool(node, "simple-audio-routing")) {
+ ret = snd_soc_of_parse_audio_routing(&info->snd_card,
"simple-audio-routing");
- if (ret)
- return ret;
+ if (ret)
+ return ret;
+ }
/* CPU sub-node */
ret = -EINVAL;
--
1.8.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
