From patchwork Mon Dec 16 14:08:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bard Liao X-Patchwork-Id: 13909756 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61F3A2040BF for ; Mon, 16 Dec 2024 14:08:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734358115; cv=none; b=O/tW/ZL+/EkTJbdpGPlQ9N+grki02UVjJz4xjpZnWoB4+pLWCbm+TdZXeWnAPhOHWyx0+wsm5bZP0MxmeQ127DQzQ/LcDeYIZuwf39RtuutDTw3LyekH6gOQfHcHSFdxJaWVKFxH6N8OotcASdHDqC35M+W727VTCfaTSLIbIM4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734358115; c=relaxed/simple; bh=FK1wX3mNul3AUjKOaVGcQ2RrtHxGcHQ3IXLF3NxxHa8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mv9/rK79Wze3u5tQyZbrxhmC/C38xcGf+NsEu7fdpFXcNI1neAj4fvNfKS6KKk/G7xdliVFpLahdYh66UKm/j5xH6xMVE+vvt9yJv+m2bHIpJYkxfdmtKt4sO2laUBU67aVvatpNgTORTdTGp+wa4z9haat8WNAroPlS3avRl1Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=TscMi/tX; arc=none smtp.client-ip=192.198.163.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="TscMi/tX" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1734358114; x=1765894114; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=FK1wX3mNul3AUjKOaVGcQ2RrtHxGcHQ3IXLF3NxxHa8=; b=TscMi/tXoVN+EUsiNvJj03zO2GY6hs04rShSDKze3ARqhXe/6bXwYLeJ 4wdj8ZiXOilDz23ITyzfR4DVe/+r0RAWrhylVCwWXviPFSfwv0pFfrzUx qqmlomUC3cG3xl8aMSTwsdpMnHa0UGg1dKWUx+fvA3CYTHEXGfZAoWNln jHut9DxzRJQfiDlPoGOM7TyIOes3bgnWgSDdN9qTZWRmKepgZrUehO5up zjbCuoQbWBJjSaZOcfmFThpRZqZIGVlfR+BhStjJaYsyv6c+pwy29eHkT UqRzG89WxyNwX9jYoFMdQp9eMQ4pjdRkVh5GmkFGyn+3eXm8ZoAan7uJ1 Q==; X-CSE-ConnectionGUID: GupeG3u2Qu+Llkmlg9ZHcw== X-CSE-MsgGUID: CaSGYhSMT+OKJHJ+N5VlAw== X-IronPort-AV: E=McAfee;i="6700,10204,11288"; a="34063287" X-IronPort-AV: E=Sophos;i="6.12,238,1728975600"; d="scan'208";a="34063287" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Dec 2024 06:08:34 -0800 X-CSE-ConnectionGUID: eQA01NvgQGq+VUxivF9OjQ== X-CSE-MsgGUID: I/RHoTfrSeGjft8SKRJnAw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,238,1728975600"; d="scan'208";a="97446896" Received: from spandruv-mobl4.amr.corp.intel.com (HELO yungchua-desk.intel.com) ([10.124.223.238]) by fmviesa008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Dec 2024 06:08:32 -0800 From: Bard Liao To: broonie@kernel.org, tiwai@suse.de Cc: linux-sound@vger.kernel.org, pierre-louis.bossart@linux.dev, bard.liao@intel.com Subject: [PATCH v2 1/2] ASoC: Intel: sof_sdw: Fix DMI match for Lenovo 21Q6 and 21Q7 Date: Mon, 16 Dec 2024 22:08:20 +0800 Message-ID: <20241216140821.153670-2-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241216140821.153670-1-yung-chuan.liao@linux.intel.com> References: <20241216140821.153670-1-yung-chuan.liao@linux.intel.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Richard Fitzgerald Update the DMI match for a Lenovo laptop to the new DMI identifier. This laptop ships with a different DMI identifier to what was expected, and now has two identifiers. Signed-off-by: Richard Fitzgerald Fixes: 83c062ae81e8 ("ASoC: Intel: sof_sdw: Add quirks for some new Lenovo laptops") Signed-off-by: Bard Liao --- sound/soc/intel/boards/sof_sdw.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index 53410fb44673..139f4306dc87 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -646,9 +646,17 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { .callback = sof_sdw_quirk_cb, .matches = { DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), - DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "233B") + DMI_MATCH(DMI_PRODUCT_NAME, "21Q6") }, - .driver_data = (void *)(SOC_SDW_SIDECAR_AMPS), + .driver_data = (void *)(SOC_SDW_SIDECAR_AMPS | SOC_SDW_CODEC_MIC), + }, + { + .callback = sof_sdw_quirk_cb, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "21Q7") + }, + .driver_data = (void *)(SOC_SDW_SIDECAR_AMPS | SOC_SDW_CODEC_MIC), }, /* ArrowLake devices */ From patchwork Mon Dec 16 14:08:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bard Liao X-Patchwork-Id: 13909757 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 494ED205ADE for ; Mon, 16 Dec 2024 14:08:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734358117; cv=none; b=HTaI/U8OafQdnzFsvoo3yxXmit+XY3EFNUutDNOOOX4Yi/5wf0C+7aWHwbhy5VBkne0OuW4+pf6W3RekHfbMHgRlGneV9fAdQu4UTGtKqzElxxsggCccj6vmZxMZ3S5r4iAaiS50IU6fl/bh7m3JTfT2VCjla92DMaTw6cXQE14= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734358117; c=relaxed/simple; bh=pdpUrexsVimiqdRPrbJnoEPjX3JXsFQFKaAqVtkXB7E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=k4HeHDXN/Ekp3Xo5sj82HXoSO0TnLr5j9+OYSacDXQA0UFzyT2KwyR4tXPKM0hbUL8bCJ74iWP+VviLnj+V22rCsC7OarMJXbqKYv5lMlHNqPQHsI3kNoqCOXuEy0tNRWDU0XYeXLxuVFnnqb6EZZ7r6Ls6v0jWLGRiaT0B9O2k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=ldqpV2Gx; arc=none smtp.client-ip=192.198.163.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ldqpV2Gx" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1734358115; x=1765894115; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pdpUrexsVimiqdRPrbJnoEPjX3JXsFQFKaAqVtkXB7E=; b=ldqpV2GxgPXYLwsAgPHFzPd1swjfk+ZO9LKaADfNKbPzKjy249ler+q5 xMA+AfY1QzRYdSaw43df/4m0i812GRQkKiaeh8EAawzp7NgHHg9Ys9oQ+ z1B9EtxGLOYI8ttRr0JGlDFcTXCsMsNf9c/dhXG+4PDMqBE06opF+VGXd WKf1ZVIighi3aaCQKTXWmy/O7ln0716aV/Ryw3Nl6c00GsA+W/6pwaSnR ew4MKtb+XEjz9p38kmwioxxPkilGP6dsa3zb3zITmx8TvJA32pk0I7mob uTH1OUiRlZe4uU7oA2isfj9Kfo/jV8TwBOwfpgM1D8bjsgdl6Dj8LToUy A==; X-CSE-ConnectionGUID: AqlzW5vPRLORwaTknoaU+w== X-CSE-MsgGUID: 07jAakieSkyuNnChCg8Fag== X-IronPort-AV: E=McAfee;i="6700,10204,11288"; a="34063293" X-IronPort-AV: E=Sophos;i="6.12,238,1728975600"; d="scan'208";a="34063293" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Dec 2024 06:08:35 -0800 X-CSE-ConnectionGUID: MMNZnNE1QWyiOE52glfozQ== X-CSE-MsgGUID: +0ej6XtqQguCY8SU373wQA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,238,1728975600"; d="scan'208";a="97446900" Received: from spandruv-mobl4.amr.corp.intel.com (HELO yungchua-desk.intel.com) ([10.124.223.238]) by fmviesa008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Dec 2024 06:08:33 -0800 From: Bard Liao To: broonie@kernel.org, tiwai@suse.de Cc: linux-sound@vger.kernel.org, pierre-louis.bossart@linux.dev, bard.liao@intel.com Subject: [PATCH v2 2/2] ASoC: Intel: sof_sdw: Fix DMI match for Lenovo 21QA and 21QB Date: Mon, 16 Dec 2024 22:08:21 +0800 Message-ID: <20241216140821.153670-3-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241216140821.153670-1-yung-chuan.liao@linux.intel.com> References: <20241216140821.153670-1-yung-chuan.liao@linux.intel.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Richard Fitzgerald Update the DMI match for a Lenovo laptop to the new DMI identifier. This laptop ships with a different DMI identifier to what was expected, and now has two identifiers. Signed-off-by: Richard Fitzgerald Fixes: ea657f6b24e1 ("ASoC: Intel: sof_sdw: Add quirk for cs42l43 system using host DMICs") Signed-off-by: Bard Liao --- sound/soc/intel/boards/sof_sdw.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index 139f4306dc87..9f721b88e606 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -637,7 +637,16 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { .callback = sof_sdw_quirk_cb, .matches = { DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), - DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "233C") + DMI_MATCH(DMI_PRODUCT_NAME, "21QB") + }, + /* Note this quirk excludes the CODEC mic */ + .driver_data = (void *)(SOC_SDW_CODEC_MIC), + }, + { + .callback = sof_sdw_quirk_cb, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "21QA") }, /* Note this quirk excludes the CODEC mic */ .driver_data = (void *)(SOC_SDW_CODEC_MIC),