From patchwork Wed Oct 16 03:03:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bard Liao X-Patchwork-Id: 13837624 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) (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 700F621E3C2 for ; Wed, 16 Oct 2024 03:03:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729047839; cv=none; b=RDbXu2Tpt6M0Msbd1xLCdYxSw/C00d8SYHbxdHDd3fsLW+kKpBEsNR2mGCCsN+RDDFATMwkI0HqVBs05aHKBLcEGAt3d1jIxDKS1+zIie16K/kwd/b0q4IInZDPCYD/aFVfq4lg1urGvc+8Rt1HAl7GVwO54DhTSwBrAhtNjYnU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729047839; c=relaxed/simple; bh=1uyd59oi/v0GnUCGO4ACvxD2/aegFyaIbYPOrqcjal0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sARTnuptMOfj8+R8VdzNcITjjtq+iCsFEZcBbISMnrFXp+jND2xxE5BA+dB8wOPJIfgHytAIM5QbTstUlUi7COM2+bKUvtsRfK1O2WJUO+yuJ/RNVCc56fQ0a6c7/+QYxuaWXbeNfPg0kwABpWRShd6qprE7inyl8aM7ZcmjHZY= 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=oEenz/p0; arc=none smtp.client-ip=198.175.65.20 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="oEenz/p0" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1729047839; x=1760583839; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1uyd59oi/v0GnUCGO4ACvxD2/aegFyaIbYPOrqcjal0=; b=oEenz/p0xL6Fo15w863RDAhFVEkhkPG8KekHKHdb6EFDR+XjOid7AOJZ 0Dmfoea33253tQC2wG8qCxV79tdt1X07ksAEPqi1u25c+QQEVTzcyD8im CRvMosLu7MHTmYNhMtQMgSqzK9YDLoM63KdDwW+B1WKP+zeXuDfZS1qOQ 2AWXzWtpuo+ky2OuFsdUsryk4vu2Q30jHdIWXPhrZrgwrwd+M0eI1TfvJ bwZi9kIbvCFLEKFHQWQL5Je1L9FllWbFOGQF6Zp8B3EM49tX7rxNxPmbD v8lTbXgBhYtTMMOmNXg8nZ2JrYLXoQEKGzyKdlwHm0Bb5zIrFhjoH2EGb A==; X-CSE-ConnectionGUID: YqRSQJH/RaSkZ3EhFCQCnA== X-CSE-MsgGUID: 6kJPCUA6T6qSIelHw+481w== X-IronPort-AV: E=McAfee;i="6700,10204,11222"; a="28265527" X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="28265527" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2024 20:03:59 -0700 X-CSE-ConnectionGUID: 5wJQRkOLTq2ASO6Z3iHBaw== X-CSE-MsgGUID: R73Hrc35Qu+oE5NquynzCg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,206,1725346800"; d="scan'208";a="77979231" Received: from cvapit-mobl1.ger.corp.intel.com (HELO yungchua-desk.intel.com) ([10.247.118.236]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2024 20:03:56 -0700 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 1/4] ASoC: sdw_utils: Add support for exclusion DAI quirks Date: Wed, 16 Oct 2024 11:03:41 +0800 Message-ID: <20241016030344.13535-2-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241016030344.13535-1-yung-chuan.liao@linux.intel.com> References: <20241016030344.13535-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: Charles Keepax The system contains a mechanism for certain DAI links to be included based on a quirk. Add support for certain DAI links to excluded based on a quirk, this is useful in situations where the vast majority of SKUs utilise a feature so it is easier to quirk on those that don't. Signed-off-by: Charles Keepax Reviewed-by: Liam Girdwood Signed-off-by: Bard Liao --- include/sound/soc_sdw_utils.h | 1 + sound/soc/sdw_utils/soc_sdw_utils.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/sound/soc_sdw_utils.h b/include/sound/soc_sdw_utils.h index 2374e6df4e58..e16fccd48e6b 100644 --- a/include/sound/soc_sdw_utils.h +++ b/include/sound/soc_sdw_utils.h @@ -59,6 +59,7 @@ struct asoc_sdw_dai_info { int (*rtd_init)(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); bool rtd_init_done; /* Indicate that the rtd_init callback is done */ unsigned long quirk; + bool quirk_exclude; }; struct asoc_sdw_codec_info { diff --git a/sound/soc/sdw_utils/soc_sdw_utils.c b/sound/soc/sdw_utils/soc_sdw_utils.c index a9323cb444d0..f86d55cdaaf6 100644 --- a/sound/soc/sdw_utils/soc_sdw_utils.c +++ b/sound/soc/sdw_utils/soc_sdw_utils.c @@ -1153,7 +1153,8 @@ int asoc_sdw_parse_sdw_endpoints(struct snd_soc_card *card, dai_info = &codec_info->dais[adr_end->num]; soc_dai = asoc_sdw_find_dailink(soc_dais, adr_end); - if (dai_info->quirk && !(dai_info->quirk & ctx->mc_quirk)) + if (dai_info->quirk && + !(dai_info->quirk_exclude ^ !!(dai_info->quirk & ctx->mc_quirk))) continue; dev_dbg(dev, From patchwork Wed Oct 16 03:03:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bard Liao X-Patchwork-Id: 13837625 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) (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 D698A21E3C2 for ; Wed, 16 Oct 2024 03:04:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729047842; cv=none; b=sWDtnraWwUb4KMmxDvPGUv8RMJ0hE3Kv3JpLT5vcBLU4TIG0HRAcEQZRUPq/xOiE8y2s9SfaGJFaqqiVb9Ze3iVO+uYbTJFEOhNJK9Fovdgz70kJJqTV80kcZKTLJSEfekr6MVGNnJkFFgSZwBMFiYBS2nJMS+kIkxOsHdMYLiM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729047842; c=relaxed/simple; bh=WOdsbh88JUit1Hrl57mJJGYfFOcLvU1H/HJyDTOUlxk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SDkJQccb4JoVTtXpPHRvW0A6mWFkyT/Cp29vq6/rAI1ZQwP68PDBr2+56vteY3YUmbkLbZ9WPFE2laVeDtFQl/SOpMyLbJ8mqnJ+tGmE4NU1XO8yeYhgOKLE2dB24zrzuKf6dHQdpEaWebTDw57p/xVm2CV6ZQQS0MpG8axIlBQ= 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=KFbDGr0L; arc=none smtp.client-ip=198.175.65.20 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="KFbDGr0L" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1729047841; x=1760583841; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WOdsbh88JUit1Hrl57mJJGYfFOcLvU1H/HJyDTOUlxk=; b=KFbDGr0L03H2jb45Lmw98/xJeSTZAMfLhHPHP20GMB6AHiqEGEHqKP5v Vu7dlic4B/kAIFPUC+D6LivB+kYt5xZbvPywqoPmXCAMmjbV26pRFaMCs Kt05iSWz8AxCEAf/Iqt7oiM36sOu3YnTU3tkWba266JWeCrQKs3Pi5pWo 8fC/UDxfLCU2fPeI8HxWzwclPxshZh6FQ6iPLMjF5PGitcOrK4HN3D1+7 148wI0dZBTQlCeCVOGlcUjcXTJ/J5eUewVelukNMjiXc5ww7jnMNIQbGY Ghq865VvN38FKZXdZ31BqW00byP7kIe8cROn98Ay/k0juCbbWxiyFTtJ+ w==; X-CSE-ConnectionGUID: QJNOtK3DTXqWHW5CuAjHlg== X-CSE-MsgGUID: UINDdhQARPWyM+8nDlu2jA== X-IronPort-AV: E=McAfee;i="6700,10204,11222"; a="28265543" X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="28265543" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2024 20:04:01 -0700 X-CSE-ConnectionGUID: /p8VoJoqSPqgvpWUAgN65w== X-CSE-MsgGUID: kEEE9/ZiSuWZDwcLAzn50g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,206,1725346800"; d="scan'208";a="77979238" Received: from cvapit-mobl1.ger.corp.intel.com (HELO yungchua-desk.intel.com) ([10.247.118.236]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2024 20:03:58 -0700 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 2/4] ASoC: sdw_utils: Add a quirk to allow the cs42l43 mic DAI to be ignored Date: Wed, 16 Oct 2024 11:03:42 +0800 Message-ID: <20241016030344.13535-3-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241016030344.13535-1-yung-chuan.liao@linux.intel.com> References: <20241016030344.13535-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: Charles Keepax To support some systems using host microphones add a quirk to allow the cs42l43 microphone DAI link to be ignored. Signed-off-by: Charles Keepax Reviewed-by: Liam Girdwood Signed-off-by: Bard Liao --- include/sound/soc_sdw_utils.h | 1 + sound/soc/sdw_utils/soc_sdw_utils.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/include/sound/soc_sdw_utils.h b/include/sound/soc_sdw_utils.h index e16fccd48e6b..a25f94d6eb67 100644 --- a/include/sound/soc_sdw_utils.h +++ b/include/sound/soc_sdw_utils.h @@ -28,6 +28,7 @@ * - SOC_SDW_CODEC_SPKR | SOF_SIDECAR_AMPS - Not currently supported */ #define SOC_SDW_SIDECAR_AMPS BIT(16) +#define SOC_SDW_CODEC_MIC BIT(17) #define SOC_SDW_UNUSED_DAI_ID -1 #define SOC_SDW_JACK_OUT_DAI_ID 0 diff --git a/sound/soc/sdw_utils/soc_sdw_utils.c b/sound/soc/sdw_utils/soc_sdw_utils.c index f86d55cdaaf6..6f6bff0f69fc 100644 --- a/sound/soc/sdw_utils/soc_sdw_utils.c +++ b/sound/soc/sdw_utils/soc_sdw_utils.c @@ -528,6 +528,8 @@ struct asoc_sdw_codec_info codec_info_list[] = { .rtd_init = asoc_sdw_cs42l43_dmic_rtd_init, .widgets = generic_dmic_widgets, .num_widgets = ARRAY_SIZE(generic_dmic_widgets), + .quirk = SOC_SDW_CODEC_MIC, + .quirk_exclude = true, }, { .direction = {false, true}, From patchwork Wed Oct 16 03:03:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bard Liao X-Patchwork-Id: 13837626 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) (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 35FB121E3C2 for ; Wed, 16 Oct 2024 03:04:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729047844; cv=none; b=MBFCvFMQ1OWu0JPZrB6uVoH39qBxea9WjrynJErxAb074hGDknDb/0Z1vWHb9A4y8BGZpg31uYrCQYwx/FmQP3CwcvxUydNSO+Wj/dCIlacT+GyjlS5q9d6LRR3ysQ7c93DLWM/7rUJ8A8kIboBf6qk3FS/MeWwVqXFsUR8xaC0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729047844; c=relaxed/simple; bh=gjbYAN980IE8cKvnapaGXXskrrg+5IHvN3yfjJE7sa4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LTZWNmKY6ltrcrVpja1MRqoDVyI/yttBT6bxiJT9Fz5j7xzPmTZ6IflzB3CSYKVFIIglkl7BmhGwnY/JQ9vVx7EFGp+byaPTjp3ssfrY4RL+QQ9Zt+CGFWBb7YdZlTYK/TA2kmYxiV1of7P5eF44CsCMMpF5TvHDcAw4MMAV7jw= 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=gaoqGpDn; arc=none smtp.client-ip=198.175.65.20 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="gaoqGpDn" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1729047844; x=1760583844; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gjbYAN980IE8cKvnapaGXXskrrg+5IHvN3yfjJE7sa4=; b=gaoqGpDnQDSHjqR1f08RtJD1nKVk8K0RIXla2XtMnQe1VAaA5VkkVELo D6e0mdeXfwug48ZQlc2XKR3ted874bVWr9KoGC/NMRsDXH9SGw2/1WHbW nzp9IKgSJnv/wPD6R1EvMymPSHIumf+EGagFZTCpvloS93gTKqXBvsC9A nQx+C4fNaqIg1jwOGf9F2dbzKRJXD3t/Z7ACtLpHBbte65+A5JcAZDzyk u5TExkvXzyh/wYxr6/nTFOmOlYMsfo7ZU56y6gfwFzyY7CR6bz+mzpTfM 9jREOHj/JGe0Hea6x3zUvOUkfzIKLsZvun1Oxyj1b4KxwwZ4kNX8iVRgs g==; X-CSE-ConnectionGUID: jWXDZeGZQvaJHknAl0YIGA== X-CSE-MsgGUID: BoWbKXLFT8uBGBrYfZ84Vw== X-IronPort-AV: E=McAfee;i="6700,10204,11222"; a="28265554" X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="28265554" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2024 20:04:03 -0700 X-CSE-ConnectionGUID: rC7sU7stT2S/Y6qZRySM8Q== X-CSE-MsgGUID: NIABTA7UQj2uzM+v39X+EA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,206,1725346800"; d="scan'208";a="77979246" Received: from cvapit-mobl1.ger.corp.intel.com (HELO yungchua-desk.intel.com) ([10.247.118.236]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2024 20:04:01 -0700 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 3/4] ASoC: Intel: sof_sdw: Add quirk for cs42l43 system using host DMICs Date: Wed, 16 Oct 2024 11:03:43 +0800 Message-ID: <20241016030344.13535-4-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241016030344.13535-1-yung-chuan.liao@linux.intel.com> References: <20241016030344.13535-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: Charles Keepax Add quirk to inform the machine driver to not bind in the cs42l43 microphone DAI link. Signed-off-by: Charles Keepax Reviewed-by: Liam Girdwood Signed-off-by: Bard Liao --- sound/soc/intel/boards/sof_sdw.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index 0a87aa9347ef..f08636589284 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -580,6 +580,15 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { }, .driver_data = (void *)(SOC_SDW_CODEC_SPKR), }, + { + .callback = sof_sdw_quirk_cb, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "233C") + }, + /* Note this quirk excludes the CODEC mic */ + .driver_data = (void *)(SOC_SDW_CODEC_MIC), + }, /* ArrowLake devices */ { From patchwork Wed Oct 16 03:03:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bard Liao X-Patchwork-Id: 13837627 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) (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 A6F9421E3C2 for ; Wed, 16 Oct 2024 03:04:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729047847; cv=none; b=YOeVmuXbDONmM3xp6tiW4hGpoF48NcoHR7a1ljvee7J0Ew5NDUh1D0SFSDWhCQ2RaKmjMOKkI5GTM/qVS6BSGlc1Gm2XZbEibtB2oVycABXH9ylBmJQPOCBPXXZcvvmvndGglkfmBA6xaBrkxL9CjyUekXr5aq4/Ryc+92iMiM0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729047847; c=relaxed/simple; bh=nRCXKrcK+2X0hpKI4+Woq0FgH0goeE+zTdJeAqkMS7E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S1rU9A7Wa5eUgh4jEdzoCf9yxgtmHZmSIu5+jf0TVs8zOW/NmHtxBcts0RptnYqN5/G3G/WgTbnj/SyNJ43jYtZD52h5o0ZmmaNMhAocYx5/TIayLotMyuSL0ovgw/eh0ZpclwF5DJilcAHTIaOLEhvVWcp6ELGOU/6RruEYnwo= 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=X5R6p5Qx; arc=none smtp.client-ip=198.175.65.20 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="X5R6p5Qx" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1729047846; x=1760583846; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nRCXKrcK+2X0hpKI4+Woq0FgH0goeE+zTdJeAqkMS7E=; b=X5R6p5QxiDfOzQoPXigRusfVmXCflMFItJEigqBwh2dyq8lEhT2HtP0w gM8kAhHe244zIAS6ULygeZMu1z7otsHcGAXgfdudqF4tv+Jj3JqpmUtX8 CXp7p/dVzmRKeltOzUUO3JuiF2uz30wyLGFiF7ucCcUYlAS4GcwzAFalf 458cFezSoBUq3tt4d2SlUf8hhbXBMRCamKPEUFbZFltrhbt0vHo/GtImg ovh0kRzj6V+V6yihHLwfJuDsbiGZGiN0MGx7epXe/yniW6z/nnM221rSl +4S5AF4j15/i6k1m1HWfLZ2i0LTIcuxHDayrtNFiGFoIiE+5ufzOscVAW A==; X-CSE-ConnectionGUID: qrwgjrUaRiyPaLqnrPimtA== X-CSE-MsgGUID: COA+QVjvS0yCXzssLoEDXA== X-IronPort-AV: E=McAfee;i="6700,10204,11222"; a="28265564" X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="28265564" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2024 20:04:06 -0700 X-CSE-ConnectionGUID: L7AcoobxR9aCoKqG5kn1dw== X-CSE-MsgGUID: eCAX4l/ySR+eFhppH4D31w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,206,1725346800"; d="scan'208";a="77979251" Received: from cvapit-mobl1.ger.corp.intel.com (HELO yungchua-desk.intel.com) ([10.247.118.236]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2024 20:04:03 -0700 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 4/4] ASoC: Intel: sof_sdw: Add quirks for some new Lenovo laptops Date: Wed, 16 Oct 2024 11:03:44 +0800 Message-ID: <20241016030344.13535-5-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241016030344.13535-1-yung-chuan.liao@linux.intel.com> References: <20241016030344.13535-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: Charles Keepax Add some more sidecar amplifier quirks. Signed-off-by: Charles Keepax Reviewed-by: Liam Girdwood Signed-off-by: Bard Liao --- sound/soc/intel/boards/sof_sdw.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index f08636589284..a6e391791bad 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -580,6 +580,30 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { }, .driver_data = (void *)(SOC_SDW_CODEC_SPKR), }, + { + .callback = sof_sdw_quirk_cb, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "3838") + }, + .driver_data = (void *)(SOC_SDW_SIDECAR_AMPS), + }, + { + .callback = sof_sdw_quirk_cb, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "3832") + }, + .driver_data = (void *)(SOC_SDW_SIDECAR_AMPS), + }, + { + .callback = sof_sdw_quirk_cb, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "380E") + }, + .driver_data = (void *)(SOC_SDW_SIDECAR_AMPS), + }, { .callback = sof_sdw_quirk_cb, .matches = { @@ -589,6 +613,14 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { /* 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_EXACT_MATCH(DMI_PRODUCT_SKU, "233B") + }, + .driver_data = (void *)(SOC_SDW_SIDECAR_AMPS), + }, /* ArrowLake devices */ {