未验证 提交 24913664 编写于 作者: P Pierre-Louis Bossart 提交者: Mark Brown

ASoC: Intel: sof_es8336: remove hard-coded SSP selection

For some reason we open-coded the SSP selection and only supported
SSP0, 1 and 2. On ApolloLake platforms, the SSP5 can be used as well
for the ES8336 hardware link.

Remove hard-coded if/else code and align with same code already used
in the SOF driver.

BugLink: https://github.com/thesofproject/sof/issues/6015Reviewed-by: NRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: NBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: NPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220725194909.145418-8-pierre-louis.bossart@linux.intel.comSigned-off-by: NMark Brown <broonie@kernel.org>
上级 fae93e3b
...@@ -604,18 +604,14 @@ static int sof_es8336_probe(struct platform_device *pdev) ...@@ -604,18 +604,14 @@ static int sof_es8336_probe(struct platform_device *pdev)
/* /*
* Set configuration based on platform NHLT. * Set configuration based on platform NHLT.
* In this machine driver, we can only support one SSP for the * In this machine driver, we can only support one SSP for the
* ES8336 link, the else-if below are intentional. * ES8336 link.
* In some cases multiple SSPs can be reported by NHLT, starting MSB-first * In some cases multiple SSPs can be reported by NHLT, starting MSB-first
* seems to pick the right connection. * seems to pick the right connection.
*/ */
unsigned long ssp = 0; unsigned long ssp;
if (mach->mach_params.i2s_link_mask & BIT(2)) /* fls returns 1-based results, SSPs indices are 0-based */
ssp = SOF_ES8336_SSP_CODEC(2); ssp = fls(mach->mach_params.i2s_link_mask) - 1;
else if (mach->mach_params.i2s_link_mask & BIT(1))
ssp = SOF_ES8336_SSP_CODEC(1);
else if (mach->mach_params.i2s_link_mask & BIT(0))
ssp = SOF_ES8336_SSP_CODEC(0);
quirk |= ssp; quirk |= ssp;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册