On Thu, Nov 24, 2022 at 02:47:51PM +0100, Salvatore Bonaccorso wrote:
Hi Greg,
On Wed, Nov 23, 2022 at 09:49:54AM +0100, Greg Kroah-Hartman wrote:
From: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com
[ Upstream commit 41deb2db64997d01110faaf763bd911d490dfde7 ]
Some NUC15 LAPBC710 devices don't expose the same DMI information as the Intel reference, add additional entry in the match table.
BugLink: https://github.com/thesofproject/linux/issues/3885 Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com Reviewed-by: Ranjani Sridharan ranjani.sridharan@linux.intel.com Reviewed-by: Bard Liao yung-chuan.liao@linux.intel.com Link: https://lore.kernel.org/r/20221017204054.207512-1-pierre-louis.bossart@linux... Signed-off-by: Mark Brown broonie@kernel.org Signed-off-by: Sasha Levin sashal@kernel.org
sound/soc/intel/boards/sof_sdw.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index 25548555d8d7..5e1a718a64da 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -175,6 +175,17 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { SOF_SDW_PCH_DMIC | SOF_RT711_JD_SRC_JD2), },
- {
/* NUC15 LAPBC710 skews */.callback = sof_sdw_quirk_cb,.matches = {DMI_MATCH(DMI_BOARD_VENDOR, "Intel Corporation"),DMI_MATCH(DMI_BOARD_NAME, "LAPBC710"),},.driver_data = (void *)(SOF_SDW_TGL_HDMI |SOF_SDW_PCH_DMIC |RT711_JD1),- }, /* TigerLake-SDCA devices */ { .callback = sof_sdw_quirk_cb,
-- 2.35.1
This one causes a build failure for 5.10.156-rc1 (not tested newer ones possibly affected):
sound/soc/intel/boards/sof_sdw.c:187:6: error: ‘RT711_JD1’ undeclared here (not in a function) 187 | RT711_JD1), | ^~~~~~~~~ make[7]: *** [scripts/Makefile.build:286: sound/soc/intel/boards/sof_sdw.o] Error 1 make[6]: *** [scripts/Makefile.build:503: sound/soc/intel/boards] Error 2 make[5]: *** [scripts/Makefile.build:503: sound/soc/intel] Error 2 make[4]: *** [scripts/Makefile.build:503: sound/soc] Error 2 make[3]: *** [Makefile:1837: sound] Error 2 make[3]: *** Waiting for unfinished jobs....
If not mistaken this is because 5.10.y does not have yet 8e6c00f1fdea ("ASoC: Intel: sof_sdw: include rt711.h for RT711 JD mode") which is present on 5.15-rc1 onwards.
Thanks, I've now dropped this commit.
greg k-h