mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-07 11:28:32 +00:00
soundwire: intel: fix PDI/stream mapping for Bulk
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: Pierre-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: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
parent
3ccb8551f5
commit
c134f914e9
1 changed files with 8 additions and 2 deletions
|
@ -480,7 +480,10 @@ intel_pdi_shim_configure(struct sdw_intel *sdw, struct sdw_cdns_pdi *pdi)
|
||||||
unsigned int link_id = sdw->instance;
|
unsigned int link_id = sdw->instance;
|
||||||
int pdi_conf = 0;
|
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
|
* Program stream parameters to stream SHIM register
|
||||||
|
@ -509,7 +512,10 @@ intel_pdi_alh_configure(struct sdw_intel *sdw, struct sdw_cdns_pdi *pdi)
|
||||||
unsigned int link_id = sdw->instance;
|
unsigned int link_id = sdw->instance;
|
||||||
unsigned int conf;
|
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 */
|
/* Program Stream config ALH register */
|
||||||
conf = intel_readl(alh, SDW_ALH_STRMZCFG(pdi->intel_alh_id));
|
conf = intel_readl(alh, SDW_ALH_STRMZCFG(pdi->intel_alh_id));
|
||||||
|
|
Loading…
Reference in a new issue