ALSA: hda/tegra: Add Tegra264 support

commit 1c4193917eb3279788968639f24d72ffeebdec6b upstream.

Update HDA driver to support Tegra264 differences from legacy HDA,
which includes: clocks/resets, always power on, and hardware-managed
FPCI/IPFS initialization. The driver retrieves this chip-specific
information from soc_data.

Signed-off-by: Mohan Kumar D <mkumard@nvidia.com>
Signed-off-by: Sheetal <sheetal@nvidia.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20250512064258.1028331-4-sheetal@nvidia.com
Stable-dep-of: e0a911ac8685 ("ALSA: hda: Add missing NVIDIA HDA codec IDs")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/sound/pci/hda/hda_tegra.c b/sound/pci/hda/hda_tegra.c
index 976a112c7d0061c932c82310b376bacf381fc2c8..b921cc180d83b5dcaa386d2c02770c7cd94c6539 100644 (file)
--- a/sound/pci/hda/hda_tegra.c
+++ b/sound/pci/hda/hda_tegra.c
@@ -71,6 +71,10 @@
 struct hda_tegra_soc {
        bool has_hda2codec_2x_reset;
        bool has_hda2hdmi;
+       bool has_hda2codec_2x;
+       bool input_stream;
+       bool always_on;
+       bool requires_init;
 };
 
 struct hda_tegra {
@@ -186,7 +190,9 @@ static int __maybe_unused hda_tegra_runtime_resume(struct device *dev)
        if (rc != 0)
                return rc;
        if (chip->running) {
-               hda_tegra_init(hda);
+               if (hda->soc->requires_init)
+                       hda_tegra_init(hda);
+
                azx_init_chip(chip, 1);
                /* disable controller wake up event*/
                azx_writew(chip, WAKEEN, azx_readw(chip, WAKEEN) &
@@ -251,7 +257,8 @@ static int hda_tegra_init_chip(struct azx *chip, struct platform_device *pdev)
        bus->remap_addr = hda->regs + HDA_BAR0;
        bus->addr = res->start + HDA_BAR0;
 
-       hda_tegra_init(hda);
+       if (hda->soc->requires_init)
+               hda_tegra_init(hda);
 
        return 0;
 }
@@ -324,7 +331,7 @@ static int hda_tegra_first_init(struct azx *chip, struct platform_device *pdev)
         * starts with offset 0 which is wrong as HW register for output stream
         * offset starts with 4.
         */
-       if (of_device_is_compatible(np, "nvidia,tegra234-hda"))
+       if (!hda->soc->input_stream)
                chip->capture_streams = 4;
 
        chip->playback_streams = (gcap >> 12) & 0x0f;
@@ -420,7 +427,6 @@ static int hda_tegra_create(struct snd_card *card,
        chip->driver_caps = driver_caps;
        chip->driver_type = driver_caps & 0xff;
        chip->dev_index = 0;
-       chip->jackpoll_interval = msecs_to_jiffies(5000);
        INIT_LIST_HEAD(&chip->pcm_list);
 
        chip->codec_probe_mask = -1;
@@ -437,7 +443,16 @@ static int hda_tegra_create(struct snd_card *card,
        chip->bus.core.sync_write = 0;
        chip->bus.core.needs_damn_long_delay = 1;
        chip->bus.core.aligned_mmio = 1;
-       chip->bus.jackpoll_in_suspend = 1;
+
+       /*
+        * HDA power domain and clocks are always on for Tegra264 and
+        * the jack detection logic would work always, so no need of
+        * jack polling mechanism running.
+        */
+       if (!hda->soc->always_on) {
+               chip->jackpoll_interval = msecs_to_jiffies(5000);
+               chip->bus.jackpoll_in_suspend = 1;
+       }
 
        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
        if (err < 0) {
@@ -451,22 +466,44 @@ static int hda_tegra_create(struct snd_card *card,
 static const struct hda_tegra_soc tegra30_data = {
        .has_hda2codec_2x_reset = true,
        .has_hda2hdmi = true,
+       .has_hda2codec_2x = true,
+       .input_stream = true,
+       .always_on = false,
+       .requires_init = true,
 };
 
 static const struct hda_tegra_soc tegra194_data = {
        .has_hda2codec_2x_reset = false,
        .has_hda2hdmi = true,
+       .has_hda2codec_2x = true,
+       .input_stream = true,
+       .always_on = false,
+       .requires_init = true,
 };
 
 static const struct hda_tegra_soc tegra234_data = {
        .has_hda2codec_2x_reset = true,
        .has_hda2hdmi = false,
+       .has_hda2codec_2x = true,
+       .input_stream = false,
+       .always_on = false,
+       .requires_init = true,
+};
+
+static const struct hda_tegra_soc tegra264_data = {
+       .has_hda2codec_2x_reset = true,
+       .has_hda2hdmi = false,
+       .has_hda2codec_2x = false,
+       .input_stream = false,
+       .always_on = true,
+       .requires_init = false,
 };
 
 static const struct of_device_id hda_tegra_match[] = {
        { .compatible = "nvidia,tegra30-hda", .data = &tegra30_data },
        { .compatible = "nvidia,tegra194-hda", .data = &tegra194_data },
        { .compatible = "nvidia,tegra234-hda", .data = &tegra234_data },
+       { .compatible = "nvidia,tegra264-hda", .data = &tegra264_data },
        {},
 };
 MODULE_DEVICE_TABLE(of, hda_tegra_match);
@@ -521,7 +558,9 @@ static int hda_tegra_probe(struct platform_device *pdev)
        hda->clocks[hda->nclocks++].id = "hda";
        if (hda->soc->has_hda2hdmi)
                hda->clocks[hda->nclocks++].id = "hda2hdmi";
-       hda->clocks[hda->nclocks++].id = "hda2codec_2x";
+
+       if (hda->soc->has_hda2codec_2x)
+               hda->clocks[hda->nclocks++].id = "hda2codec_2x";
 
        err = devm_clk_bulk_get(&pdev->dev, hda->nclocks, hda->clocks);
        if (err < 0)

diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 0ffacc779cd66e6453c0ca809f45d46b31c9e83b..8dc0476bce4c121be28e8d9889b1e57c0ee9058a 100644 (file)
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -4556,6 +4556,7 @@ HDA_CODEC_ENTRY(0x10de002e, "Tegra186 HDMI/DP1", patch_tegra_hdmi),
 HDA_CODEC_ENTRY(0x10de002f, "Tegra194 HDMI/DP2", patch_tegra_hdmi),
 HDA_CODEC_ENTRY(0x10de0030, "Tegra194 HDMI/DP3", patch_tegra_hdmi),
 HDA_CODEC_ENTRY(0x10de0031, "Tegra234 HDMI/DP", patch_tegra234_hdmi),
+HDA_CODEC_ENTRY(0x10de0034, "Tegra264 HDMI/DP",        patch_tegra234_hdmi),
 HDA_CODEC_ENTRY(0x10de0040, "GPU 40 HDMI/DP",  patch_nvhdmi),
 HDA_CODEC_ENTRY(0x10de0041, "GPU 41 HDMI/DP",  patch_nvhdmi),
 HDA_CODEC_ENTRY(0x10de0042, "GPU 42 HDMI/DP",  patch_nvhdmi),