Signed-off-by: Daniel Baluta <[email protected]>
---
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.
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
On Fri, Aug 11, 2017 at 05:12:19PM +0300, Daniel Baluta wrote:
> Signed-off-by: Daniel Baluta <[email protected]>
> ---
> 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 <[email protected]>
Hi
> Signed-off-by: Daniel Baluta <[email protected]>
> ---
> 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 <[email protected]>
> 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
On Lu, 2017-08-21 at 00:43 +0000, Kuninori Morimoto wrote:
> Hi
>
> >
> > Signed-off-by: Daniel Baluta <[email protected]>
> > ---
> > 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 <[email protected]>
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.
Daniel.
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 <[email protected]>
>
> 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