Google Groups no longer supports new Usenet posts or subscriptions. Historical content remains viewable.
Dismiss

[PATCH] ASoC: simple-card: fix the DAPM routes map parsing

5 views
Skip to first unread message

Xiubo Li

unread,
Jan 6, 2014, 1:40:02 AM1/6/14
to
The simple-card's DAPM route maping is optional. For example, the spdif has
no need of this.

Signed-off-by: Xiubo Li <Li.X...@freescale.com>
---
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 e86ddf5..889908a 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -145,10 +145,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-card,routing")) {
+ ret = snd_soc_of_parse_audio_routing(&info->snd_card,
"simple-audio-card,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 majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Mark Brown

unread,
Jan 6, 2014, 10:40:02 AM1/6/14
to
On Mon, Jan 06, 2014 at 01:41:46PM +0800, Xiubo Li wrote:
> The simple-card's DAPM route maping is optional. For example, the spdif has
> no need of this.

This doesn't seem to apply against current code, can you please check
and resend?
signature.asc

Li.X...@freescale.com

unread,
Jan 6, 2014, 7:00:03 PM1/6/14
to


> > The simple-card's DAPM route maping is optional. For example, the spdif has
> > no need of this.
>
> This doesn't seem to apply against current code, can you please check
> and resend?
>
Yes, I will.

Thanks,

--
Best Regards,
Xiubo--

Xiubo Li

unread,
Jan 6, 2014, 9:10:02 PM1/6/14
to
The simple-card's DAPM route maping is optional.

Signed-off-by: Xiubo Li <Li.X...@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


--

Mark Brown

unread,
Jan 7, 2014, 10:50:02 AM1/7/14
to
On Tue, Jan 07, 2014 at 09:13:42AM +0800, Xiubo Li wrote:
> The simple-card's DAPM route maping is optional.

Applied both, thanks.
signature.asc
0 new messages