Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf924962 authored by Bard Liao's avatar Bard Liao Committed by Vinod Koul
Browse files

soundwire: intel: fix intel_register_dai PDI offsets and numbers 



There are two issues, likely copy/paste:

1. Use cdns->pcm.num_in instead of stream_num_in for consistency with
the rest of the code. This was not detected earlier since platforms did
not have input-only PDIs.

2. use the correct offset for bi-dir PDM, based on IN and OUT
PDIs. Again this was not detected since PDM was not supported earlier.

Reported-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20190916192348.467-2-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 0f8c0f8a

drivers/soundwire/intel.c

+2 −2
Original line number Diff line number Diff line
@@ -900,7 +900,7 @@ static int intel_register_dai(struct sdw_intel *sdw) 
	/* Create PCM DAIs */

	stream = &cdns->pcm;



	ret = intel_create_dai(cdns, dais, INTEL_PDI_IN, stream->num_in,

	ret = intel_create_dai(cdns, dais, INTEL_PDI_IN, cdns->pcm.num_in,

			       off, stream->num_ch_in, true);

	if (ret)

		return ret;
@@ -931,7 +931,7 @@ static int intel_register_dai(struct sdw_intel *sdw) 
	if (ret)

		return ret;



	off += cdns->pdm.num_bd;

	off += cdns->pdm.num_out;

	ret = intel_create_dai(cdns, dais, INTEL_PDI_BD, cdns->pdm.num_bd,

			       off, stream->num_ch_bd, false);

	if (ret)