tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NVIDIA: SAUCE: ALSA: hda/tegra: Revert the HDA reset property check

Browse Source 
To be in sync with upstream kernel, revert the reset
property check. As HDA has reset property will define
it in DT.

http://nvbugs/4788373

Signed-off-by: Sheetal <sheetal@nvidia.com>
Reviewed-by: Sameer Pujar <spujar@nvidia.com>
Reviewed-by: Mohan kumar <mkumard@nvidia.com>
Signed-off-by: Vishwaroop A <va@nvidia.com>
Acked-by: Noah Wager <noah.wager@canonical.com>
Acked-by: Jacob Martin <jacob.martin@canonical.com>
Signed-off-by: Noah Wager <noah.wager@canonical.com>
This commit is contained in:
Sheetal
2024-12-20 06:37:47 +00:00
committed by Noah Wager
parent 5f03a33a11
commit 1be6c649b1
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sound/pci/hda/hda_tegra.c
+18 -20
View File
@@ -494,7 +494,7 @@ static const struct hda_tegra_soc tegra234_data = {
};
static const struct hda_tegra_soc tegra264_data = {
.has_hda2codec_2x_reset = false,
.has_hda2codec_2x_reset = true,
.has_hda2hdmi = false,
.has_hda2codec_2x = false,
.input_stream = false,
@@ -536,29 +536,27 @@ static int hda_tegra_probe(struct platform_device *pdev)
return err;
}
if (reset_control_get_count(&pdev->dev) > 0) {
hda->resets[hda->nresets++].id = "hda";
hda->resets[hda->nresets++].id = "hda";
/*
* "hda2hdmi" is not applicable for Tegra234. This is because the
* codec is separate IP and not under display SOR partition now.
*/
if (hda->soc->has_hda2hdmi)
hda->resets[hda->nresets++].id = "hda2hdmi";
/*
* "hda2hdmi" is not applicable for Tegra234. This is because the
* codec is separate IP and not under display SOR partition now.
*/
if (hda->soc->has_hda2hdmi)
hda->resets[hda->nresets++].id = "hda2hdmi";
/*
* "hda2codec_2x" reset is not present on Tegra194. Though DT would
* be updated to reflect this, but to have backward compatibility
* below is necessary.
*/
if (hda->soc->has_hda2codec_2x_reset)
hda->resets[hda->nresets++].id = "hda2codec_2x";
/*
* "hda2codec_2x" reset is not present on Tegra194. Though DT would
* be updated to reflect this, but to have backward compatibility
* below is necessary.
*/
if (hda->soc->has_hda2codec_2x_reset)
hda->resets[hda->nresets++].id = "hda2codec_2x";
err = devm_reset_control_bulk_get_exclusive(&pdev->dev, hda->nresets,
err = devm_reset_control_bulk_get_exclusive(&pdev->dev, hda->nresets,
hda->resets);
if (err)
goto out_free;
}
if (err)
goto out_free;
hda->clocks[hda->nclocks++].id = "hda";
if (hda->soc->has_hda2hdmi)