Commit 188ab4bf authored by Brent Lu's avatar Brent Lu Committed by Takashi Iwai
Browse files

ASoC: SOF: ipc4-topology: support NHLT device type 



The endpoint in NHLT table for a SSP port could have the device type
NHLT_DEVICE_BT or NHLT_DEVICE_I2S. Use intel_nhlt_ssp_device_type()
function to retrieve the device type before querying the endpoint
blob to make sure we are always using correct device type parameter.

Signed-off-by: default avatarBrent Lu <brent.lu@intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Message-ID: <20231127120657.19764-3-peter.ujfalusi@linux.intel.com>
parent 02545bc5

sound/soc/sof/ipc4-topology.c

+16 −3
Original line number Diff line number Diff line
@@ -1356,6 +1356,7 @@ static int snd_sof_get_nhlt_endpoint_data(struct snd_sof_dev *sdev, struct snd_s 
	int sample_rate, channel_count;

	int bit_depth, ret;

	u32 nhlt_type;

	int dev_type = 0;



	/* convert to NHLT type */

	switch (linktype) {
@@ -1371,18 +1372,30 @@ static int snd_sof_get_nhlt_endpoint_data(struct snd_sof_dev *sdev, struct snd_s 
						   &bit_depth);

		if (ret < 0)

			return ret;



		/*

		 * We need to know the type of the external device attached to a SSP

		 * port to retrieve the blob from NHLT. However, device type is not

		 * specified in topology.

		 * Query the type for the port and then pass that information back

		 * to the blob lookup function.

		 */

		dev_type = intel_nhlt_ssp_device_type(sdev->dev, ipc4_data->nhlt,

						      dai_index);

		if (dev_type < 0)

			return dev_type;

		break;

	default:

		return 0;

	}



	dev_dbg(sdev->dev, "dai index %d nhlt type %d direction %d\n",

		dai_index, nhlt_type, dir);

	dev_dbg(sdev->dev, "dai index %d nhlt type %d direction %d dev type %d\n",

		dai_index, nhlt_type, dir, dev_type);



	/* find NHLT blob with matching params */

	cfg = intel_nhlt_get_endpoint_blob(sdev->dev, ipc4_data->nhlt, dai_index, nhlt_type,

					   bit_depth, bit_depth, channel_count, sample_rate,

					   dir, 0);

					   dir, dev_type);



	if (!cfg) {

		dev_err(sdev->dev,