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

Commit b3fcff6b authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Greg Kroah-Hartman
Browse files

soundwire: intel: fix PDI/stream mapping for Bulk 



[ Upstream commit c134f914e9f55b7817e2bae625ec0e5f1379f7cd ]

The previous formula is incorrect for PDI0/1, the mapping is not
linear but has a discontinuity between PDI1 and PDI2.

This change has no effect on PCM PDIs (same mapping).

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191022232948.17156-1-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3fd36843

drivers/soundwire/intel.c

+8 −2
Original line number Diff line number Diff line
@@ -352,7 +352,10 @@ intel_pdi_shim_configure(struct sdw_intel *sdw, struct sdw_cdns_pdi *pdi) 
	unsigned int link_id = sdw->instance;

	int pdi_conf = 0;



	pdi->intel_alh_id = (link_id * 16) + pdi->num + 5;

	/* the Bulk and PCM streams are not contiguous */

	pdi->intel_alh_id = (link_id * 16) + pdi->num + 3;

	if (pdi->num >= 2)

		pdi->intel_alh_id += 2;



	/*

	 * Program stream parameters to stream SHIM register
@@ -381,7 +384,10 @@ intel_pdi_alh_configure(struct sdw_intel *sdw, struct sdw_cdns_pdi *pdi) 
	unsigned int link_id = sdw->instance;

	unsigned int conf;



	pdi->intel_alh_id = (link_id * 16) + pdi->num + 5;

	/* the Bulk and PCM streams are not contiguous */

	pdi->intel_alh_id = (link_id * 16) + pdi->num + 3;

	if (pdi->num >= 2)

		pdi->intel_alh_id += 2;



	/* Program Stream config ALH register */

	conf = intel_readl(alh, SDW_ALH_STRMZCFG(pdi->intel_alh_id));