ASoC: tegra: Restore AC97 support

BugLink: https://bugs.launchpad.net/bugs/1951822
commit de8fc2b0a3f9930f3cbe801d40758bb1d80b0ad8 upstream.

The device-tree of AC97 codecs need to be parsed differently from I2S
codecs, plus codec device may need to be created. This was missed by the
patch that unified machine drivers into a single driver, fix it. It should
restore audio on Toradex Colibri board.

Cc: <stable@vger.kernel.org>
Fixes: cc8f70f56039 ("ASoC: tegra: Unify ASoC machine drivers")
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Link: https://lore.kernel.org/r/20211024192853.21957-1-digetx@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/sound/soc/tegra/tegra_asoc_machine.c b/sound/soc/tegra/tegra_asoc_machine.c
index ba009ef8e032a0b331f3854c54865b68b9b443f9..78fb423df550bd75c0f56919225f3cae5b0cf583 100644 (file)
--- a/sound/soc/tegra/tegra_asoc_machine.c
+++ b/sound/soc/tegra/tegra_asoc_machine.c
@@ -341,9 +341,34 @@ tegra_machine_parse_phandle(struct device *dev, const char *name)
        return np;
 }
 
+static void tegra_machine_unregister_codec(void *pdev)
+{
+       platform_device_unregister(pdev);
+}
+
+static int tegra_machine_register_codec(struct device *dev, const char *name)
+{
+       struct platform_device *pdev;
+       int err;
+
+       if (!name)
+               return 0;
+
+       pdev = platform_device_register_simple(name, -1, NULL, 0);
+       if (IS_ERR(pdev))
+               return PTR_ERR(pdev);
+
+       err = devm_add_action_or_reset(dev, tegra_machine_unregister_codec,
+                                      pdev);
+       if (err)
+               return err;
+
+       return 0;
+}
+
 int tegra_asoc_machine_probe(struct platform_device *pdev)
 {
-       struct device_node *np_codec, *np_i2s;
+       struct device_node *np_codec, *np_i2s, *np_ac97;
        const struct tegra_asoc_data *asoc;
        struct device *dev = &pdev->dev;
        struct tegra_machine *machine;
@@ -404,17 +429,30 @@ int tegra_asoc_machine_probe(struct platform_device *pdev)
                        return err;
        }
 
-       np_codec = tegra_machine_parse_phandle(dev, "nvidia,audio-codec");
-       if (IS_ERR(np_codec))
-               return PTR_ERR(np_codec);
+       if (asoc->set_ac97) {
+               err = tegra_machine_register_codec(dev, asoc->codec_dev_name);
+               if (err)
+                       return err;
+
+               np_ac97 = tegra_machine_parse_phandle(dev, "nvidia,ac97-controller");
+               if (IS_ERR(np_ac97))
+                       return PTR_ERR(np_ac97);
 
-       np_i2s = tegra_machine_parse_phandle(dev, "nvidia,i2s-controller");
-       if (IS_ERR(np_i2s))
-               return PTR_ERR(np_i2s);
+               card->dai_link->cpus->of_node = np_ac97;
+               card->dai_link->platforms->of_node = np_ac97;
+       } else {
+               np_codec = tegra_machine_parse_phandle(dev, "nvidia,audio-codec");
+               if (IS_ERR(np_codec))
+                       return PTR_ERR(np_codec);
 
-       card->dai_link->cpus->of_node = np_i2s;
-       card->dai_link->codecs->of_node = np_codec;
-       card->dai_link->platforms->of_node = np_i2s;
+               np_i2s = tegra_machine_parse_phandle(dev, "nvidia,i2s-controller");
+               if (IS_ERR(np_i2s))
+                       return PTR_ERR(np_i2s);
+
+               card->dai_link->cpus->of_node = np_i2s;
+               card->dai_link->codecs->of_node = np_codec;
+               card->dai_link->platforms->of_node = np_i2s;
+       }
 
        if (asoc->add_common_controls) {
                card->controls = tegra_machine_controls;
@@ -589,6 +627,7 @@ static struct snd_soc_card snd_soc_tegra_wm9712 = {
 static const struct tegra_asoc_data tegra_wm9712_data = {
        .card = &snd_soc_tegra_wm9712,
        .add_common_dapm_widgets = true,
+       .codec_dev_name = "wm9712-codec",
        .set_ac97 = true,
 };
 

diff --git a/sound/soc/tegra/tegra_asoc_machine.h b/sound/soc/tegra/tegra_asoc_machine.h
index 8ee0ec814f67c2156f6c55a97b64fe7cc7d11dc5..d6a8d13205516cca949e1fb75cf7d3dc6df86387 100644 (file)
--- a/sound/soc/tegra/tegra_asoc_machine.h
+++ b/sound/soc/tegra/tegra_asoc_machine.h
@@ -13,6 +13,7 @@ struct snd_soc_pcm_runtime;
 
 struct tegra_asoc_data {
        unsigned int (*mclk_rate)(unsigned int srate);
+       const char *codec_dev_name;
        struct snd_soc_card *card;
        unsigned int mclk_id;
        bool hp_jack_gpio_active_low;