ASoC: simple-card: Restore original configuration of DAI format [Linux 5.2]

ASoC: simple-card: Restore original configuration of DAI format [Linux 5.2]

This Linux kernel change "ASoC: simple-card: Restore original configuration of DAI format" is included in the Linux 5.2 release. This change is authored by Jon Hunter <jonathanh [at] nvidia.com> on Fri May 24 09:54:04 2019 +0100. The commit for this change in Linux stable tree is 4819d06 (patch).

ASoC: simple-card: Restore original configuration of DAI format

Revert commit 069d037aea98 ("ASoC: simple-card: Fix configuration of
DAI format"). During further review, it turns out that the actual issue
was caused by an incorrectly formatted device-tree node describing the
soundcard.

The following is incorrect because the simple-audio-card
'bitclock-master' and 'frame-master' properties should not reference the
actual codec phandle ...

    sound {
        compatible = "simple-audio-card";
        ...
    =>  simple-audio-card,bitclock-master = <&codec>;
    =>  simple-audio-card,frame-master = <&codec>;
        ...

        simple-audio-card,cpu {
            sound-dai = <&xxx>;
        };

        simple-audio-card,codec {
    =>      sound-dai = <&codec>;
        };
    };

Rather, these properties should reference the phandle to the
'simple-audio-card,codec' property as shown below ...

    sound {
        compatible = "simple-audio-card";
        ...
    =>  simple-audio-card,bitclock-master = <&codec>;
    =>  simple-audio-card,frame-master = <&codec>;
        ...

        simple-audio-card,cpu {
            sound-dai = <&xxx>;
        };

    =>  codec: simple-audio-card,codec { /* simple-card wants here */
            sound-dai = <&xxx>;  /* not here */
        };
    };

Signed-off-by: Jon Hunter <[email protected]>
Signed-off-by: Mark Brown <[email protected]>

There are 10 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 sound/soc/generic/simple-card.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index c2c8dcb..9b568f5 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -283,6 +283,11 @@ static int simple_dai_link_of(struct asoc_simple_priv *priv,
    codec_dai       =
    dai_props->codec_dai    = &priv->dais[li->dais++];

+   ret = asoc_simple_parse_daifmt(dev, node, codec,
+                      prefix, &dai_link->dai_fmt);
+   if (ret < 0)
+       goto dai_link_of_err;
+
    simple_parse_mclk_fs(top, cpu, codec, dai_props, prefix);

    ret = asoc_simple_parse_cpu(cpu, dai_link, &single_cpu);
@@ -293,11 +298,6 @@ static int simple_dai_link_of(struct asoc_simple_priv *priv,
    if (ret < 0)
        goto dai_link_of_err;

-   ret = asoc_simple_parse_daifmt(dev, node, dai_link->codecs->of_node,
-                      prefix, &dai_link->dai_fmt);
-   if (ret < 0)
-       goto dai_link_of_err;
-
    ret = asoc_simple_parse_platform(plat, dai_link);
    if (ret < 0)
        goto dai_link_of_err;

Leave a Reply

Your email address will not be published. Required fields are marked *