Re: [PATCH AUTOSEL 5.10 1/3] ASOC: Intel: sof_sdw: add quirk for Intel 'Rooks County' NUC M15

Salvatore Bonaccorso
2023-05-10T11:59:22Z

Hi Sasha,

On Thu, Apr 20, 2023 at 07:03:22AM -0400, Sasha Levin wrote:
> From: Eugene Huang <eugene.huang99@gmail.com>
>
> [ Upstream commit 3c728b1bc5b99c5275ac5c7788ef814c0e51ef54 ]
>
> Same quirks as the 'Bishop County' NUC M15, except the rt711 is in the
> 'JD2 100K' jack detection mode.
>
> Link: https://github.com/thesofproject/linux/issues/4088
> Signed-off-by: Eugene Huang <eugene.huang99@gmail.com>
> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
> Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
> Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
> Link: https://lore.kernel.org/r/20230314090553.498664-2-yung-chuan.liao@linux.intel.com
> 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 f5d8f7951cfc3..eb713e9c2bd22 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 'Rooks County' LAPRC510 and LAPRC710 skews */
> + .callback = sof_sdw_quirk_cb,
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "Intel(R) Client Systems"),
> + DMI_MATCH(DMI_PRODUCT_NAME, "LAPRC"),
> + },
> + .driver_data = (void *)(SOF_SDW_TGL_HDMI |
> + SOF_SDW_PCH_DMIC |
> + RT711_JD2_100K),
> + },
> /* TigerLake-SDCA devices */
> {
> .callback = sof_sdw_quirk_cb,
> --
> 2.39.2

Is this correct that this can be picked for 5.10.y? I did (by mistake)
AFAICS this is in 5.10.180-rc1, and building leads to:

sound/soc/intel/boards/sof_sdw.c:187:6: error: ‘RT711_JD2_100K’ undeclared here (not in a function)
187 | RT711_JD2_100K),
| ^~~~~~~~~~~~~~
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

Regards,
Salvatore