Skip to content

ASoC: SOF: Intel: hda: Only check SSP MCLK mask in case of IPC3 #5587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ujfalusi merged 1 commit into from
Nov 26, 2025
Merged

ASoC: SOF: Intel: hda: Only check SSP MCLK mask in case of IPC3 #5587

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 22 additions & 14 deletions sound/soc/sof/intel/hda.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1623,7 +1623,6 @@ struct snd_soc_acpi_mach *hda_machine_select(struct snd_sof_dev *sdev)
mach->tplg_quirk_mask & SND_SOC_ACPI_TPLG_INTEL_SSP_NUMBER &&
mach->mach_params.i2s_link_mask) {
int ssp_num;
int mclk_mask;

if (hweight_long(mach->mach_params.i2s_link_mask) > 1 &&
!(mach->tplg_quirk_mask & SND_SOC_ACPI_TPLG_INTEL_SSP_MSB))
Expand All @@ -1648,19 +1647,28 @@ struct snd_soc_acpi_mach *hda_machine_select(struct snd_sof_dev *sdev)

sof_pdata->tplg_filename = tplg_filename;

mclk_mask = check_nhlt_ssp_mclk_mask(sdev, ssp_num);

if (mclk_mask < 0) {
dev_err(sdev->dev, "Invalid MCLK configuration\n");
return NULL;
}

dev_dbg(sdev->dev, "MCLK mask %#x found in NHLT\n", mclk_mask);

if (mclk_mask) {
dev_info(sdev->dev, "Overriding topology with MCLK mask %#x from NHLT\n", mclk_mask);
sdev->mclk_id_override = true;
sdev->mclk_id_quirk = (mclk_mask & BIT(0)) ? 0 : 1;
if (sof_pdata->ipc_type == SOF_IPC_TYPE_3) {
int mclk_mask = check_nhlt_ssp_mclk_mask(sdev,
ssp_num);

if (mclk_mask < 0) {
dev_err(sdev->dev,
"Invalid MCLK configuration for SSP%d\n",
ssp_num);
return NULL;
}

if (mclk_mask) {
sdev->mclk_id_override = true;
sdev->mclk_id_quirk = (mclk_mask & BIT(0)) ? 0 : 1;
dev_info(sdev->dev,
"SSP%d to use MCLK id %d (mask: %#x)\n",
ssp_num, sdev->mclk_id_quirk, mclk_mask);
} else {
dev_dbg(sdev->dev,
"MCLK mask is empty for SSP%d in NHLT\n",
ssp_num);
}
}
}

Expand Down
Loading