On Wed, Nov 24, 2021 at 11:01:24PM +0100, Salvatore Bonaccorso wrote: > On Wed, Nov 24, 2021 at 10:55:10PM +0100, Salvatore Bonaccorso wrote: > > Hi Greg, > > > > On Wed, Nov 24, 2021 at 12:57:04PM +0100, Greg Kroah-Hartman wrote: > > > From: Pierre-Louis Bossart <pierre-louis.bossart@xxxxxxxxxxxxxxx> > > > > > > [ Upstream commit 64ba6d2ce72ffde70dc5a1794917bf1573203716 ] > > > > > > This device is based on SDCA codecs but with a single amplifier > > > instead of two. > > > > > > BugLink: https://github.com/thesofproject/linux/issues/3161 > > > Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@xxxxxxxxxxxxxxx> > > > Reviewed-by: Rander Wang <rander.wang@xxxxxxxxx> > > > Reviewed-by: Bard Liao <bard.liao@xxxxxxxxx> > > > Link: https://lore.kernel.org/r/20211004213512.220836-6-pierre-louis.bossart@xxxxxxxxxxxxxxx > > > Signed-off-by: Mark Brown <broonie@xxxxxxxxxx> > > > Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> > > > --- > > > sound/soc/intel/boards/sof_sdw.c | 10 ++++++++++ > > > 1 file changed, 10 insertions(+) > > > > > > diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c > > > index 25548555d8d79..d9b864856be19 100644 > > > --- a/sound/soc/intel/boards/sof_sdw.c > > > +++ b/sound/soc/intel/boards/sof_sdw.c > > > @@ -187,6 +187,16 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { > > > SOF_RT715_DAI_ID_FIX | > > > SOF_SDW_FOUR_SPK), > > > }, > > > + { > > > + .callback = sof_sdw_quirk_cb, > > > + .matches = { > > > + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"), > > > + DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A45") > > > + }, > > > + .driver_data = (void *)(SOF_SDW_TGL_HDMI | > > > + RT711_JD2 | > > > + SOF_RT715_DAI_ID_FIX), > > > + }, > > > /* AlderLake devices */ > > > { > > > .callback = sof_sdw_quirk_cb, > > > > This one causes a build failure: > > > > sound/soc/intel/boards/sof_sdw.c:197:41: error: ‘RT711_JD2’ undeclared here (not in a function) > > 197 | RT711_JD2 | > > | ^~~~~~~~~ > > CC lib/mpi/mpicoder.o > > make[7]: *** [scripts/Makefile.build:280: sound/soc/intel/boards/sof_sdw.o] Error 1 > > make[6]: *** [scripts/Makefile.build:497: sound/soc/intel/boards] Error 2 > > make[5]: *** [scripts/Makefile.build:497: sound/soc/intel] Error 2 > > make[4]: *** [scripts/Makefile.build:497: sound/soc] Error 2 > > make[3]: *** [Makefile:1822: sound] Error 2 > > > > We do not have for instance 8e6c00f1fdea ("ASoC: Intel: sof_sdw: include > > rt711.h for RT711 JD mode") for stable series. > > Should have added: [...] before 5.15-rc1. Thanks, I'll go drop the commit for now, if someone needs/wants it, I'll take a working backport :) thanks, greg k-h
