ASoC: simple-scu-card: Parse off codec widgets

Message ID 1502460739-12134-1-git-send-email-daniel.baluta@nxp.com
State Not Applicable
Headers show

Commit Message

Daniel Baluta Aug. 11, 2017, 2:12 p.m.
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
---
 Documentation/devicetree/bindings/sound/simple-scu-card.txt | 1 +
 sound/soc/generic/simple-scu-card.c                         | 4 ++++
 2 files changed, 5 insertions(+)

Comments

Rob Herring Aug. 17, 2017, 8:13 p.m. | #1
On Fri, Aug 11, 2017 at 05:12:19PM +0300, Daniel Baluta wrote:
> Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
> ---
>  Documentation/devicetree/bindings/sound/simple-scu-card.txt | 1 +
>  sound/soc/generic/simple-scu-card.c                         | 4 ++++
>  2 files changed, 5 insertions(+)

Acked-by: Rob Herring <robh@kernel.org>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kuninori Morimoto Aug. 21, 2017, 12:43 a.m. | #2
Hi

> Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
> ---
>  Documentation/devicetree/bindings/sound/simple-scu-card.txt | 1 +
>  sound/soc/generic/simple-scu-card.c                         | 4 ++++
>  2 files changed, 5 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/sound/simple-scu-card.txt b/Documentation/devicetree/bindings/sound/simple-scu-card.txt
> index 327d229..32f8dbc 100644
> --- a/Documentation/devicetree/bindings/sound/simple-scu-card.txt
> +++ b/Documentation/devicetree/bindings/sound/simple-scu-card.txt
> @@ -24,6 +24,7 @@ Optional subnode properties:
>  - simple-audio-card,convert-rate	: platform specified sampling rate convert
>  - simple-audio-card,convert-channels	: platform specified converted channel size (2 - 8 ch)
>  - simple-audio-card,prefix		: see routing
> +- simple-audio-card,widgets		: Please refer to widgets.txt.
>  - simple-audio-card,routing		: A list of the connections between audio components.
>  					  Each entry is a pair of strings, the first being the connection's sink,
>  					  the second being the connection's source. Valid names for sources.

It can be "see simple-audio-card.txt" same as other properties.
Not a big deal though

Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

> diff --git a/sound/soc/generic/simple-scu-card.c b/sound/soc/generic/simple-scu-card.c
> index a75b385..0bb3da7 100644
> --- a/sound/soc/generic/simple-scu-card.c
> +++ b/sound/soc/generic/simple-scu-card.c
> @@ -191,6 +191,10 @@ static int asoc_simple_card_parse_of(struct simple_card_data *priv)
>  	if (!node)
>  		return -EINVAL;
>  
> +	ret = asoc_simple_card_of_parse_widgets(card, PREFIX);
> +	if (ret < 0)
> +		return ret;
> +
>  	ret = asoc_simple_card_of_parse_routing(card, PREFIX, 0);
>  	if (ret < 0)
>  		return ret;
> -- 
> 2.7.4
> 


Best regards
---
Kuninori Morimoto
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kuninori Morimoto Aug. 21, 2017, 11:50 p.m. | #3
Hi Daniel

> > > @@ -24,6 +24,7 @@ Optional subnode properties:
> > >  - simple-audio-card,convert-rate	: platform specified sampling rate convert
> > >  - simple-audio-card,convert-channels	: platform specified converted channel size (2 - 8 ch)
> > >  - simple-audio-card,prefix		: see routing
> > > +- simple-audio-card,widgets		: Please refer to widgets.txt.
> > >  - simple-audio-card,routing		: A list of the connections between audio components.
> > >  					  Each entry is a pair of strings, the first being the connection's sink,
> > >  					  the second being the connection's source. Valid names for sources.
> > It can be "see simple-audio-card.txt" same as other properties.
> > Not a big deal though
> > 
> > Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> Thanks for having a look. I don't have a strong preference, but given that
> the patch was already pushed and when you'll go to simple-audio-card.txt it
> will point you to widgets.txt we can leave it like that.

Thanks.
No problem for me, it is not a big deal :)

Best regards
---
Kuninori Morimoto
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/Documentation/devicetree/bindings/sound/simple-scu-card.txt b/Documentation/devicetree/bindings/sound/simple-scu-card.txt
index 327d229..32f8dbc 100644
--- a/Documentation/devicetree/bindings/sound/simple-scu-card.txt
+++ b/Documentation/devicetree/bindings/sound/simple-scu-card.txt
@@ -24,6 +24,7 @@  Optional subnode properties:
 - simple-audio-card,convert-rate	: platform specified sampling rate convert
 - simple-audio-card,convert-channels	: platform specified converted channel size (2 - 8 ch)
 - simple-audio-card,prefix		: see routing
+- simple-audio-card,widgets		: Please refer to widgets.txt.
 - simple-audio-card,routing		: A list of the connections between audio components.
 					  Each entry is a pair of strings, the first being the connection's sink,
 					  the second being the connection's source. Valid names for sources.
diff --git a/sound/soc/generic/simple-scu-card.c b/sound/soc/generic/simple-scu-card.c
index a75b385..0bb3da7 100644
--- a/sound/soc/generic/simple-scu-card.c
+++ b/sound/soc/generic/simple-scu-card.c
@@ -191,6 +191,10 @@  static int asoc_simple_card_parse_of(struct simple_card_data *priv)
 	if (!node)
 		return -EINVAL;
 
+	ret = asoc_simple_card_of_parse_widgets(card, PREFIX);
+	if (ret < 0)
+		return ret;
+
 	ret = asoc_simple_card_of_parse_routing(card, PREFIX, 0);
 	if (ret < 0)
 		return ret;