mirror of
https://abf.rosa.ru/djam/kernel-5.15.git
synced 2025-02-23 18:42:55 +00:00
54 lines
2.1 KiB
Diff
54 lines
2.1 KiB
Diff
From 18ae22ea81ff06adeec43f178e99e667046a2c15 Mon Sep 17 00:00:00 2001
|
|
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
|
Date: Mon, 25 Jul 2022 14:49:06 -0500
|
|
Subject: [PATCH 421/424] 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/6015
|
|
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
|
|
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
|
|
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
|
Link: https://lore.kernel.org/r/20220725194909.145418-8-pierre-louis.bossart@linux.intel.com
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
---
|
|
sound/soc/intel/boards/sof_es8336.c | 14 +++++---------
|
|
1 file changed, 5 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/sound/soc/intel/boards/sof_es8336.c b/sound/soc/intel/boards/sof_es8336.c
|
|
index 027a302ef..f2beee1a7 100644
|
|
--- a/sound/soc/intel/boards/sof_es8336.c
|
|
+++ b/sound/soc/intel/boards/sof_es8336.c
|
|
@@ -604,18 +604,14 @@ static int sof_es8336_probe(struct platform_device *pdev)
|
|
/*
|
|
* Set configuration based on platform NHLT.
|
|
* 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
|
|
* seems to pick the right connection.
|
|
*/
|
|
- unsigned long ssp = 0;
|
|
-
|
|
- if (mach->mach_params.i2s_link_mask & BIT(2))
|
|
- ssp = SOF_ES8336_SSP_CODEC(2);
|
|
- 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);
|
|
+ unsigned long ssp;
|
|
+
|
|
+ /* fls returns 1-based results, SSPs indices are 0-based */
|
|
+ ssp = fls(mach->mach_params.i2s_link_mask) - 1;
|
|
|
|
quirk |= ssp;
|
|
}
|
|
--
|
|
2.35.2
|
|
|