ASoC: SOF: Intel: hda: use machine_check() for SoundWire

plbossart · broonie · commit e92edcf8023d · 2024-10-17T18:42:18.000+01:00
Use the new machine_check() callback to select an alternate topology for RT712-VB devices. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com> Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com> Link: https://patch.msgid.link/20241016102333.294448-12-yung-chuan.liao@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
@@ -1124,7 +1124,8 @@ static struct snd_soc_acpi_mach *hda_sdw_machine_select(struct snd_sof_dev *sdev
 		}
 		/* Found if all Slaves are checked */
 		if (i == hdev->info.count || !link->num_adr)
-			break;
+			if (!mach->machine_check || mach->machine_check(hdev->sdw))
+				break;
 	}
 	if (mach && mach->link_mask) {
 		mach->mach_params.links = mach->links;

Original file line number	Diff line number	Diff line change
`@@ -1124,7 +1124,8 @@ static struct snd_soc_acpi_mach hda_sdw_machine_select(struct snd_sof_dev sdev`
`1124`	`1124`	`}`
`1125`	`1125`	`/* Found if all Slaves are checked */`
`1126`	`1126`	`if (i == hdev->info.count \|\| !link->num_adr)`
`1127`		`- break;`
	`1127`	`+ if (!mach->machine_check \|\| mach->machine_check(hdev->sdw))`
	`1128`	`+ break;`
`1128`	`1129`	`}`
`1129`	`1130`	`if (mach && mach->link_mask) {`
`1130`	`1131`	`mach->mach_params.links = mach->links;`