From patchwork Fri Dec 6 07:58:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bard Liao X-Patchwork-Id: 13896592 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (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 7686F1DE3C5 for ; Fri, 6 Dec 2024 07:59:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733471958; cv=none; b=WSZL+CL6VmXeldI+eFSr2VVCNieAMk03xGChBH7qmHPvA0OAdBFXhwBKbPARczq+okc/J0sdcyLH2M/bRx6wVt37J1c0QZqrWdv1o4p63ZQ9MXKYlSx7SfMh9t+hMDF+XmH8DHMStiiHJ64x2ResoeuOyfnmaWNLtI4bSERFykU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733471958; c=relaxed/simple; bh=3TXT/mmCDufKjJNQbdv+5liO4u5+w6mvYrcIfZTJYHk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Hs4ZUTChT/9/epwtGuVQo+ORk9EhSktdHJRf7H+J1HUVL2o0X2p/fX7U4fcwOY59mH8crl30FLmpsGQpRbvyi4JMPMXwnh7FZNrgrwGFKf5AxEkdwOk2UU/qUnHEXtBW70mzJ/wsOSMfZ9/FLC0aCRy/DeddS9CmFqcQlNYnuY8= 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=KAMbnKuk; arc=none smtp.client-ip=198.175.65.12 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="KAMbnKuk" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1733471956; x=1765007956; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3TXT/mmCDufKjJNQbdv+5liO4u5+w6mvYrcIfZTJYHk=; b=KAMbnKukHFpA7wTzp31t2TMI/FLRWnDmA+P65ie+ilv54PnDEv82pYKl K6pYR2YMqmus7LAF7tIft1tyO0/tXu9pcJUuspbEruc+tjGLPUREnZjr8 KvzKuGn5a0RWE1kX9zkoC9xR6eN2HKiCFFj5kuEWlalCa8kpn7QH7pOir lmFcWCcXYT74t40+1LnH0KSeBYCjpm8MpwhkxfF2VOwCBuynjYwabZ785 fwm4TyMilRhwz4fE6fd+AfoDoONZkhuN2QQF8r054ISj6BY/pGJdFZXru MtBOtIPhEIIj7MwowCqePJK7+kcu+AME8oPEjCd4P/tETcNMqD7bsn7Qo g==; X-CSE-ConnectionGUID: H+PPbfIhT+W1vA4xEoYKIg== X-CSE-MsgGUID: Rw7m+jIqRXCx6J8RlGmtWQ== X-IronPort-AV: E=McAfee;i="6700,10204,11277"; a="45192771" X-IronPort-AV: E=Sophos;i="6.12,212,1728975600"; d="scan'208";a="45192771" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Dec 2024 23:59:16 -0800 X-CSE-ConnectionGUID: Hnhg1t0YSCefcrfHxLt2Iw== X-CSE-MsgGUID: CMZUXJS5Qeel3dmOH2caaA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,212,1728975600"; d="scan'208";a="94144370" Received: from ssimmeri-mobl2.amr.corp.intel.com (HELO yungchua-desk.intel.com) ([10.124.220.179]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Dec 2024 23:59:14 -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 01/10] ASoC: Intel: sof_sdw: correct mach_params->dmic_num Date: Fri, 6 Dec 2024 15:58:54 +0800 Message-ID: <20241206075903.195730-2-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241206075903.195730-1-yung-chuan.liao@linux.intel.com> References: <20241206075903.195730-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 mach_params->dmic_num will be used to set the cfg-mics value of card->components string which should be the dmic channels. However dmic_num is dmic link number and could be set due to the SOC_SDW_PCH_DMIC quirk. Set mach_params->dmic_num to the default value if the dmic link is created due to the SOC_SDW_PCH_DMIC quirk. Fixes: 7db9f6361170 ("ASoC: Intel: sof_sdw: overwrite mach_params->dmic_num") Signed-off-by: Bard Liao Reviewed-by: Kai Vehmanen Reviewed-by: Péter Ujfalusi Reviewed-by: Liam Girdwood Reviewed-by: Ranjani Sridharan --- sound/soc/intel/boards/sof_sdw.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index 810be7c949a5..b58b9d85b56e 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -22,6 +22,8 @@ static int quirk_override = -1; module_param_named(quirk, quirk_override, int, 0444); MODULE_PARM_DESC(quirk, "Board-specific quirk override"); +#define DMIC_DEFAULT_CHANNELS 2 + static void log_quirks(struct device *dev) { if (SOC_SDW_JACK_JDSRC(sof_sdw_quirk)) @@ -1106,17 +1108,19 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) hdmi_num = SOF_PRE_TGL_HDMI_COUNT; /* enable dmic01 & dmic16k */ - if (sof_sdw_quirk & SOC_SDW_PCH_DMIC || mach_params->dmic_num) { - if (ctx->ignore_internal_dmic) - dev_warn(dev, "Ignoring PCH DMIC\n"); - else - dmic_num = 2; + if (ctx->ignore_internal_dmic) { + dev_warn(dev, "Ignoring internal DMIC\n"); + mach_params->dmic_num = 0; + } else if (mach_params->dmic_num) { + dmic_num = 2; + } else if (sof_sdw_quirk & SOC_SDW_PCH_DMIC) { + dmic_num = 2; + /* + * mach_params->dmic_num will be used to set the cfg-mics value of + * card->components string. Set it to the default value. + */ + mach_params->dmic_num = DMIC_DEFAULT_CHANNELS; } - /* - * mach_params->dmic_num will be used to set the cfg-mics value of card->components - * string. Overwrite it to the actual number of PCH DMICs used in the device. - */ - mach_params->dmic_num = dmic_num; if (sof_sdw_quirk & SOF_SSP_BT_OFFLOAD_PRESENT) bt_num = 1; From patchwork Fri Dec 6 07:58:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bard Liao X-Patchwork-Id: 13896593 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (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 701711DE4E4 for ; Fri, 6 Dec 2024 07:59:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733471958; cv=none; b=BaayBYEFqWkGK+/EgsMlqaHvlv2o2aGoogGAaPbri2zGRVbwGAHwN8D2RddE6oY275YTvi7xcMGMe3pgf8koCJ5t0Uwj4mWGTgIAJ15N4YjYl+XgAkQgdOmdN7foUy6241X5mG3iDPnn/mpz86DfGRdgLrP+MoIANjFdP4ENi68= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733471958; c=relaxed/simple; bh=wLy/wZWrNny6GW+mcW2Dmc754xzduH6mmbcD46wOXjk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=KAFkCRaKI0XL+FjY/NYDBRQOdnRK7mpzj6gE5ZAVlIi+hrJXqVpUIild8DXm+7H4tPzOWR7q92tbchvYrZeX97CAVuz4844g8nUZJibTPv3oBBhOb2GwCRFwpgLp4Gk8MccwO3vPathd2ZbdyyW1lK9bSt5CSewbuXSRRf/Gp7M= 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=OKcSuhgN; arc=none smtp.client-ip=198.175.65.12 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="OKcSuhgN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1733471957; x=1765007957; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wLy/wZWrNny6GW+mcW2Dmc754xzduH6mmbcD46wOXjk=; b=OKcSuhgNZM8itUfD+b3UEAAwRzlRqG6T6XXyh6+aYBmyaQoWMqnmF353 WsJVyKiwXLzeBG2C97MN3eSyx6zbbuPo0bz4CHm5nDqkrnuP41xPgWE/Q LMAQfvGj4WA++6Vk8AOl+wf9GMJwEmDT/cfly+Ak5Q+a9HhxF/b/9Ixfn i5MuXe9GX871FruL5tWT5XyjvhUB3TrlBlnw6MmJoFngIz8v6apbH5qGX UD0Bx066Am9hIZgjUG6kC0txmr1g8Gl357YLfPAU8HtaAKrJUbRRqViHj J7lWmoOB6E0fngVjfCXWHeNnQ0g+5ezuY5g5hEJ+FCN90YAMe2QpqVeco Q==; X-CSE-ConnectionGUID: rR0sjVcKTb2xzRg1rNw8QA== X-CSE-MsgGUID: /J3I8T9vR2eiRlAO99mNNA== X-IronPort-AV: E=McAfee;i="6700,10204,11277"; a="45192776" X-IronPort-AV: E=Sophos;i="6.12,212,1728975600"; d="scan'208";a="45192776" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Dec 2024 23:59:17 -0800 X-CSE-ConnectionGUID: dF85TEqERI6vl96r5gOGWw== X-CSE-MsgGUID: EfbbtILsS2+AtVe0jyzklQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,212,1728975600"; d="scan'208";a="94144385" Received: from ssimmeri-mobl2.amr.corp.intel.com (HELO yungchua-desk.intel.com) ([10.124.220.179]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Dec 2024 23:59:16 -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 02/10] ASoC: Intel: sof_sdw: reduce log level for not using internal dmic Date: Fri, 6 Dec 2024 15:58:55 +0800 Message-ID: <20241206075903.195730-3-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241206075903.195730-1-yung-chuan.liao@linux.intel.com> References: <20241206075903.195730-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 ctx->ignore_internal_dmic is set when there is a dedicated SoundWire DMIC is in the system. In other words, ignoring internal DMIC is expected, not an error. Signed-off-by: Bard Liao Reviewed-by: Kai Vehmanen Reviewed-by: Péter Ujfalusi Reviewed-by: Liam Girdwood Reviewed-by: Ranjani Sridharan --- sound/soc/intel/boards/sof_sdw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index b58b9d85b56e..d9fdd17a9650 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -1109,7 +1109,7 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) /* enable dmic01 & dmic16k */ if (ctx->ignore_internal_dmic) { - dev_warn(dev, "Ignoring internal DMIC\n"); + dev_dbg(dev, "SoundWire DMIC is used, ignoring internal DMIC\n"); mach_params->dmic_num = 0; } else if (mach_params->dmic_num) { dmic_num = 2; From patchwork Fri Dec 6 07:58:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bard Liao X-Patchwork-Id: 13896594 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (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 BF6C11DE3C5 for ; Fri, 6 Dec 2024 07:59:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733471960; cv=none; b=Qo0Egh738Q6vfew+g89wwh2rg24J3om3jHijbhIxlBWF9ZQuMLXl0YovR+pCnm62cWsbztUvXgCKPQTgcWBlgGLI7CDJqybTrL2Pskm+PNpnaZDNWcfgj/wP535zEAq7S5Zyt6HIj8iseTWA+Mhk87t3RfQLvl5bjBeLdUJNJjU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733471960; c=relaxed/simple; bh=m9NHyVEOFo9N/rKLpd0mFTn6tzVKqK4cZrmmf+LBGwk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=t8R0mcm+rtfsn1f0YDqj6u/PuVuH4NWZAW0HTCrGZL9QV59N7nPEWfc6oXZemjTgO2uMnnOeTdD5ARcX2pANuotUhvybpO3RUF7on/phX1NV9edB8G+Q8OPLYjucxH6VeB0H9wXBOEq/Tz8X+qVIMZOFWotScrUvMo3nooPt46s= 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=IsxcjUhj; arc=none smtp.client-ip=198.175.65.12 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="IsxcjUhj" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1733471959; x=1765007959; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=m9NHyVEOFo9N/rKLpd0mFTn6tzVKqK4cZrmmf+LBGwk=; b=IsxcjUhjcdk4MJjNpHSfJu+teY1nrOfgMPRLQLoDQYj28JZsqmqlF217 cEhBRktM0Y/sCCFWJj3Gx5fyEl5l+1seMdSefs+Ih5zrrNlKdy1Rpld7X CnEwrkMNQw0mlzMzGR5DJVJ1srKO/Hq++ssWhoWZjKZD+G887+rmXmiYE GQOPk5/A/UICcWVz3rTG8IZulWaOsDxvby2UKH49OnzVaXwheTkrLtpXr 986seOi99sZ3wU2QQ/I1WRL3mURfMorx1wpGCLl4k7lEFBiukwLH+LHdg eLrqrJzTDybaA/3Pw30a+I4CLn/3VRTdxk6sX6xpa/uqnK9D8h95FEO1v g==; X-CSE-ConnectionGUID: 9keOlNpaRDu35go046LKZw== X-CSE-MsgGUID: /wJWc62NTXSh5tVVDUF8hQ== X-IronPort-AV: E=McAfee;i="6700,10204,11277"; a="45192780" X-IronPort-AV: E=Sophos;i="6.12,212,1728975600"; d="scan'208";a="45192780" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Dec 2024 23:59:18 -0800 X-CSE-ConnectionGUID: yatpaaO6S92+hIATdeL4rg== X-CSE-MsgGUID: oqEazSQqTy6Bbm1/uOJ0UA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,212,1728975600"; d="scan'208";a="94144391" Received: from ssimmeri-mobl2.amr.corp.intel.com (HELO yungchua-desk.intel.com) ([10.124.220.179]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Dec 2024 23:59:17 -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 03/10] ASoC: Intel: sof_sdw: improve the log of DAI link numbers Date: Fri, 6 Dec 2024 15:58:56 +0800 Message-ID: <20241206075903.195730-4-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241206075903.195730-1-yung-chuan.liao@linux.intel.com> References: <20241206075903.195730-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 The log shows the number for different type of DAIs. Add "DAI link numbers:" to make the log be more explicit. Signed-off-by: Bard Liao Reviewed-by: Kai Vehmanen Reviewed-by: Péter Ujfalusi Reviewed-by: Liam Girdwood Reviewed-by: Ranjani Sridharan --- sound/soc/intel/boards/sof_sdw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index d9fdd17a9650..8b220df8ebc1 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -1125,7 +1125,7 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) if (sof_sdw_quirk & SOF_SSP_BT_OFFLOAD_PRESENT) bt_num = 1; - dev_dbg(dev, "sdw %d, ssp %d, dmic %d, hdmi %d, bt: %d\n", + dev_dbg(dev, "DAI link numbers: sdw %d, ssp %d, dmic %d, hdmi %d, bt: %d\n", sdw_be_num, ssp_num, dmic_num, intel_ctx->hdmi.idisp_codec ? hdmi_num : 0, bt_num); From patchwork Fri Dec 6 07:58:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bard Liao X-Patchwork-Id: 13896595 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (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 458A01DD88F for ; Fri, 6 Dec 2024 07:59:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733471961; cv=none; b=XVs/00oLvpi2b+KeCsrut5N5UsIClWEXd3jC8LM+caGFLF/RNayj/gq7o39aCW/ujNGOrW9U7Ofu6D6IFVPWGLM5L3layfvr7Um/AZxtie/5b+pVHdAsntWWCw1s1TgNPxYBZJB/dGtbTHlFkWmpnkJRNP1DQfrqnilcUOX6ceg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733471961; c=relaxed/simple; bh=tWlEkTC7hVmXFjXHGZAXfarADBOlET5wmKiHLfXaNEU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KwSAMsjR30SlFdEOO1rMljBTIf7nmLBVP43xnEFCi4Nyg5/VC9iUprShdSPwgk5urwV+pF87+teW2y/rqUjr4DOZwHy39LAz3A9L1AHEUuVpmpOh+Dnr8mqgpGqfQDDf3+T2XFMJ1SRnYlNtBqSIRFfmL7pXCSy69vPq4RhHaT4= 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=dd1JrZdm; arc=none smtp.client-ip=198.175.65.12 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="dd1JrZdm" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1733471960; x=1765007960; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tWlEkTC7hVmXFjXHGZAXfarADBOlET5wmKiHLfXaNEU=; b=dd1JrZdmOx7OKvULSw19FCftX0TcmYwjLbc4XvKoKUvL7tbUJvDycw9D KadwdVYXoIN8tQhGciltC5wsoWr+y7Q1aBmX1lZlhQHnTjy18XomQCIl4 tZ/Dt8LAwbzwKV5pD8u2Ti4W4FDVL7Iem47MuwLiCJMxlFdvlfM8VsoBQ XAiwWyfw7UQBa8rwbbvEwHXdlfMz3Vd30d9o2fB1ZRAq/v3kEBoXFJClJ ux5MZcq5MZROUB0zClw0aHmnQ3jVYlibrZjyzMSVzXVeiKdvTZgL/qvQX mWyAgn3mlgnzKZY3b6mz0FArX2V4+mmGVms/sSK8FO9WyNqYuep2hUQLG Q==; X-CSE-ConnectionGUID: uMfODzzTStmJGIZQ6wBY8w== X-CSE-MsgGUID: OCjQs+8nT3O/8bGHcbZjkg== X-IronPort-AV: E=McAfee;i="6700,10204,11277"; a="45192786" X-IronPort-AV: E=Sophos;i="6.12,212,1728975600"; d="scan'208";a="45192786" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Dec 2024 23:59:20 -0800 X-CSE-ConnectionGUID: +jMIpKSsRYy3k9miTdZSsg== X-CSE-MsgGUID: J57B39YlQzKAN8XMAi1nrg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,212,1728975600"; d="scan'208";a="94144404" Received: from ssimmeri-mobl2.amr.corp.intel.com (HELO yungchua-desk.intel.com) ([10.124.220.179]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Dec 2024 23:59:18 -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 04/10] ASoC: Intel: sof_sdw: Correct quirk for Lenovo Yoga Slim 7 Date: Fri, 6 Dec 2024 15:58:57 +0800 Message-ID: <20241206075903.195730-5-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241206075903.195730-1-yung-chuan.liao@linux.intel.com> References: <20241206075903.195730-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: Simon Trimmer In addition to changing the DMI match to examine the product name rather than the SKU, this adds the quirk to inform the machine driver to not bind in the cs42l43 microphone DAI link. Signed-off-by: Simon Trimmer Reviewed-by: Liam Girdwood Signed-off-by: Bard Liao --- sound/soc/intel/boards/sof_sdw.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index 8b220df8ebc1..70a1d1620e06 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -626,9 +626,10 @@ 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, "380E") + DMI_MATCH(DMI_PRODUCT_NAME, "83HM") }, - .driver_data = (void *)(SOC_SDW_SIDECAR_AMPS), + .driver_data = (void *)(SOC_SDW_SIDECAR_AMPS | + SOC_SDW_CODEC_MIC), }, { .callback = sof_sdw_quirk_cb, From patchwork Fri Dec 6 07:58:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bard Liao X-Patchwork-Id: 13896596 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (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 951BF1DE3C5 for ; Fri, 6 Dec 2024 07:59:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733471962; cv=none; b=EHTmG6oiKDEhvLpdRTfUXNovxxep6QOxZ+HJkkgdff2Jvd2G0EMtcOZpBZjF8Ye9pfTI3a/jCZDaP2GIBF2IPYrEpQgheB+xTGPEUDTRpvspiNQd2Fn9Xd/K2cLJFbWI3SAxV9Dgdd376qEghINYtIlbf1o26ShprW5GMCkLa+U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733471962; c=relaxed/simple; bh=o3G5SWn26jfuxbGnjqSyks1kF98J9JZ2595C2F0Jl7E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Tnz+ZZen4ZD73+NCHqtmUXh+enPgufyEP1LMVbo1XmLrJfUigaVkUEeRn+XKRtvAN8TckXeCynhOPaj/elqcIAPuRGhRTP3kE8RQTYQs33poPn778C1isT8XVqeR+QfMHQScqKY/riM/5a0CmbRVrO51366poXiPngC/7aEUZxU= 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=kihdNdzX; arc=none smtp.client-ip=198.175.65.12 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="kihdNdzX" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1733471961; x=1765007961; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=o3G5SWn26jfuxbGnjqSyks1kF98J9JZ2595C2F0Jl7E=; b=kihdNdzXn5yzYRzRSKihtSIq4OsZw/fl5D8uxohHid5kfBRzKuOgnnCE ATNW7A+Rh4zzOWlN9lpBdgDrDYzAZHXLxNFKOh4efJiDOGk8bibmYuKRn HLZXfjAk6eoQ4RR+gnWgO9VMMS/q2r7OToQp18c2H/CpAIoQcHRx6uc8U hhrTFzkleUWp26gfBgRUce5hOgolz35irlFhb6+MdtwUSg2WvVOsrrt9w fptWLIpnvn8QgEM1h3FjTenkrkkvQ/2SqjVIw2i2iEWdf+F+hLa4pUkkM T1AooKRh2nwDkQWjRUUgyb2g4Ym444meYyNToBmv+qBRuqJC5iwKTZ9Kr Q==; X-CSE-ConnectionGUID: DUqO4LjYSIqy1hxm5Yx72w== X-CSE-MsgGUID: U6XRqtCMRsCShFNT+4siXg== X-IronPort-AV: E=McAfee;i="6700,10204,11277"; a="45192790" X-IronPort-AV: E=Sophos;i="6.12,212,1728975600"; d="scan'208";a="45192790" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Dec 2024 23:59:21 -0800 X-CSE-ConnectionGUID: 1gt6WYnxTTuDJjhOf4F/6A== X-CSE-MsgGUID: ucxkhG76SlWM8F73PfUZxQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,212,1728975600"; d="scan'208";a="94144412" Received: from ssimmeri-mobl2.amr.corp.intel.com (HELO yungchua-desk.intel.com) ([10.124.220.179]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Dec 2024 23:59:20 -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 05/10] ASoC: Intel: sof_sdw: Add a dev_dbg message for the SOC_SDW_CODEC_MIC quirk Date: Fri, 6 Dec 2024 15:58:58 +0800 Message-ID: <20241206075903.195730-6-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241206075903.195730-1-yung-chuan.liao@linux.intel.com> References: <20241206075903.195730-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: Simon Trimmer Add debug message when SOC_SDW_CODEC_MIC is enabled (which informs the machine driver to not bind in the cs42l43 microphone DAI link). Signed-off-by: Simon Trimmer Reviewed-by: Liam Girdwood Signed-off-by: Bard Liao --- sound/soc/intel/boards/sof_sdw.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index 70a1d1620e06..0652d17a81dd 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -44,6 +44,8 @@ static void log_quirks(struct device *dev) dev_dbg(dev, "quirk SOC_SDW_CODEC_SPKR enabled\n"); if (sof_sdw_quirk & SOC_SDW_SIDECAR_AMPS) dev_dbg(dev, "quirk SOC_SDW_SIDECAR_AMPS enabled\n"); + if (sof_sdw_quirk & SOC_SDW_CODEC_MIC) + dev_dbg(dev, "quirk SOC_SDW_CODEC_MIC enabled\n"); } static int sof_sdw_quirk_cb(const struct dmi_system_id *id) From patchwork Fri Dec 6 07:58:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bard Liao X-Patchwork-Id: 13896597 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (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 B83841DE8B7 for ; Fri, 6 Dec 2024 07:59:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733471964; cv=none; b=XPtSW4jmD6YJKIOCJuk4ExSqVCcKOl5G2Z9GHUCuZ3WVwIGQeBIw0EIsMv/4G69xSecxcLUkisUQRq9VvgWP285qzpUO6ez9bUm5EM5xa6qRT/lrMShHkTcCc7zRyijlCp4UhUybxv8adQm6MJBu+ls4FbjfpFQyBZ49F8ww7Xo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733471964; c=relaxed/simple; bh=5NYBq1IGgltW8A8pWhf3q+Xz2rSXK99sjpRFMsN22Ao=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oeJFj2YwlXxrahOrP7YgjXYRqvQln6/L1xtU3fxHclUt4chzHab4Xt0dtdf+V8eK0sUFtkfX2SIXZnG6s9ltwfnXsbN6T0gRrrELUEFex7vcEego2O/75lWrcqR3gpEEXZJ7xkL2SZGxiSBsTPtpxMcrA//awsh2mb8zKq99xY0= 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=iixlV0GN; arc=none smtp.client-ip=198.175.65.12 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="iixlV0GN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1733471962; x=1765007962; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5NYBq1IGgltW8A8pWhf3q+Xz2rSXK99sjpRFMsN22Ao=; b=iixlV0GNi3Q2REYs78IKPwilZaGuOystAaxdIQ8Q7mSR2oBEItwj3qGA vAMXMSKflh9bhoSWqQNlh3kHG3luc5f+aD0hSEePzEF9KR1T1UlAsM3AU Zx69VdsP7yi4KFCWxCVbz8I8dxQooQxmoPEiKK0JKa/d1JG4QdhQPyFWZ Bexvz7juPkrkWf5eb2wKQux5siTvUQfngGw8pvAkW8Lhqfo9rQLcn2p1O oOqRi6Hiig9kYkoz5MtiJoOfQkKBj8ZTZ5+KCjAnP44SHuueYydMsP7Tk 50F/MHjZ/+/l8fuNkIR9DSnlSkFApf7qAYClaSy8bNH/hdjA52pkmRjko g==; X-CSE-ConnectionGUID: TbyGimUFTMydrSMh0W+3rQ== X-CSE-MsgGUID: 5L7xkPRPQeKvukJwioLhKQ== X-IronPort-AV: E=McAfee;i="6700,10204,11277"; a="45192794" X-IronPort-AV: E=Sophos;i="6.12,212,1728975600"; d="scan'208";a="45192794" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Dec 2024 23:59:22 -0800 X-CSE-ConnectionGUID: Cfhlrmv1TsCS5tEBYaWTYA== X-CSE-MsgGUID: 2NrbaYvCSGyPhBsCvXBgiA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,212,1728975600"; d="scan'208";a="94144425" Received: from ssimmeri-mobl2.amr.corp.intel.com (HELO yungchua-desk.intel.com) ([10.124.220.179]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Dec 2024 23:59:21 -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 06/10] ASoC: Intel: soc-acpi-intel-ptl-match: add rt712_vb + rt1320 support Date: Fri, 6 Dec 2024 15:58:59 +0800 Message-ID: <20241206075903.195730-7-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241206075903.195730-1-yung-chuan.liao@linux.intel.com> References: <20241206075903.195730-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 Add rt712_vb on SDW link 2 and 1 rt1320 on SDW link 1 configuration support. Signed-off-by: Bard Liao Reviewed-by: Liam Girdwood Reviewed-by: Kai Vehmanen --- .../intel/common/soc-acpi-intel-ptl-match.c | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/sound/soc/intel/common/soc-acpi-intel-ptl-match.c b/sound/soc/intel/common/soc-acpi-intel-ptl-match.c index f1c0d7a02cda..573fae541db7 100644 --- a/sound/soc/intel/common/soc-acpi-intel-ptl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-ptl-match.c @@ -8,6 +8,7 @@ #include #include +#include "soc-acpi-intel-sdca-quirks.h" #include "soc-acpi-intel-sdw-mockup-match.h" #include @@ -35,6 +36,13 @@ static const struct snd_soc_acpi_endpoint single_endpoint = { .group_id = 0, }; +static const struct snd_soc_acpi_endpoint spk_r_endpoint = { + .num = 0, + .aggregated = 1, + .group_position = 1, + .group_id = 1, +}; + /* * Multi-function codecs with three endpoints created for * headset, amp and dmic functions. @@ -60,6 +68,30 @@ static const struct snd_soc_acpi_endpoint rt_mf_endpoints[] = { }, }; +static const struct snd_soc_acpi_endpoint jack_amp_g1_dmic_endpoints_endpoints[] = { + /* Jack Endpoint */ + { + .num = 0, + .aggregated = 0, + .group_position = 0, + .group_id = 0, + }, + /* Amp Endpoint, work as spk_l_endpoint */ + { + .num = 1, + .aggregated = 1, + .group_position = 0, + .group_id = 1, + }, + /* DMIC Endpoint */ + { + .num = 2, + .aggregated = 0, + .group_position = 0, + .group_id = 0, + }, +}; + static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] = { { .adr = 0x000030025D071101ull, @@ -69,6 +101,15 @@ static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] = { } }; +static const struct snd_soc_acpi_adr_device rt712_vb_2_group1_adr[] = { + { + .adr = 0x000230025D071201ull, + .num_endpoints = ARRAY_SIZE(jack_amp_g1_dmic_endpoints_endpoints), + .endpoints = jack_amp_g1_dmic_endpoints_endpoints, + .name_prefix = "rt712" + } +}; + static const struct snd_soc_acpi_adr_device rt721_3_single_adr[] = { { .adr = 0x000330025d072101ull, @@ -114,6 +155,15 @@ static const struct snd_soc_acpi_adr_device rt722_3_single_adr[] = { } }; +static const struct snd_soc_acpi_adr_device rt1320_1_group1_adr[] = { + { + .adr = 0x000130025D132001ull, + .num_endpoints = 1, + .endpoints = &spk_r_endpoint, + .name_prefix = "rt1320-1" + } +}; + static const struct snd_soc_acpi_link_adr ptl_rt722_only[] = { { .mask = BIT(0), @@ -150,6 +200,20 @@ static const struct snd_soc_acpi_link_adr ptl_rvp[] = { {} }; +static const struct snd_soc_acpi_link_adr lnl_sdw_rt712_vb_l2_rt1320_l1[] = { + { + .mask = BIT(2), + .num_adr = ARRAY_SIZE(rt712_vb_2_group1_adr), + .adr_d = rt712_vb_2_group1_adr, + }, + { + .mask = BIT(1), + .num_adr = ARRAY_SIZE(rt1320_1_group1_adr), + .adr_d = rt1320_1_group1_adr, + }, + {} +}; + /* this table is used when there is no I2S codec present */ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = { /* mockup tests need to be first */ @@ -201,6 +265,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = { .drv_name = "sof_sdw", .sof_tplg_filename = "sof-ptl-rt722.tplg", }, + { + .link_mask = BIT(1) | BIT(2), + .links = lnl_sdw_rt712_vb_l2_rt1320_l1, + .drv_name = "sof_sdw", + .machine_check = snd_soc_acpi_intel_sdca_is_device_rt712_vb, + .sof_tplg_filename = "sof-lnl-rt712-l2-rt1320-l1.tplg" + }, {}, }; EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_ptl_sdw_machines); From patchwork Fri Dec 6 07:59:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bard Liao X-Patchwork-Id: 13896598 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (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 08D771DD88F for ; Fri, 6 Dec 2024 07:59:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733471965; cv=none; b=h/tfN8aRjXgIr7rFXDht+eLAS2yc1qtGjbAm7/fwO7Dh5u7Gvz2nACh0vPeTKWbE9WXejm4GklCXZAPXKQFXWPWv5x80QmPZpmKudxuUjExeiXCyJjL3dxCx1rS5Ecr+QaqCO5xEFEeDx83zPKgYFupIaCSj5wO6m9S0RL9mWDs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733471965; c=relaxed/simple; bh=alpJMwWkXrz229ORacG1w1icTT2OVJ5ZU2fPOTCexZM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NCIY6V9kch12h4532/djUw4nzLdHNxJhEOO15FqBB3z7jTIFxND+clBv9RTO5s/Bam/ffMEPWuX1xgEkwCJMaRMZf4T0YlJqlYrQFxnWZ49zhmHCKIcoScshJQJncrwyL4NeFjCKbwJYqpdYiFfHAGnL2YrZzRDham9l7VXSW6c= 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=h/rZsWCZ; arc=none smtp.client-ip=198.175.65.12 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="h/rZsWCZ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1733471964; x=1765007964; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=alpJMwWkXrz229ORacG1w1icTT2OVJ5ZU2fPOTCexZM=; b=h/rZsWCZF5rV02aZwe4cu3brVera30j4gLxNV9W+7jnsfrJbodjnx67V 5IKJ/77j2ZFizwdLoAVtnfYUVo4XUiojn6TRhQSaz/eXRVW4SWMkuZFcG pbMW0G2Smqwdjkkg0OqVT96BSX39fxjauYhb3ag3PHOiSHkJO55VGwyQv DY5ahc+lAnzaNLfdZz5UjnhSYS6csPvz6h0yczPnmRBtSEn+vy+W3T/3a 0Wxfl6G/cEXDRKycvs8rhdQ//Tyxhm5EFSkU/5FK/nUp3+rzMVey5q138 +bywylLZ3fxSxjxlqtiX+R/Wc0ghnrllmGxRmJk1j5fvE3V5/eAWAj1On w==; X-CSE-ConnectionGUID: 0mEtF1MMS5Wo6NyYvzM76w== X-CSE-MsgGUID: 87dpFpEAS4+X6+UKjBDVFg== X-IronPort-AV: E=McAfee;i="6700,10204,11277"; a="45192798" X-IronPort-AV: E=Sophos;i="6.12,212,1728975600"; d="scan'208";a="45192798" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Dec 2024 23:59:24 -0800 X-CSE-ConnectionGUID: kTeGUkBcS5aD3snjghFaMQ== X-CSE-MsgGUID: HogZgMSFR6e6D26QrWx8Ag== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,212,1728975600"; d="scan'208";a="94144447" Received: from ssimmeri-mobl2.amr.corp.intel.com (HELO yungchua-desk.intel.com) ([10.124.220.179]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Dec 2024 23:59:22 -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 07/10] ASoC: Intel: soc-acpi-intel-lnl-match: add rt713_vb_l2_rt1320_l13 support Date: Fri, 6 Dec 2024 15:59:00 +0800 Message-ID: <20241206075903.195730-8-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241206075903.195730-1-yung-chuan.liao@linux.intel.com> References: <20241206075903.195730-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 Add rt713_vb on SoundWire link 2 and rt1320 on SoundWire link 1 and 3 configuration support. Signed-off-by: Bard Liao Reviewed-by: Liam Girdwood Reviewed-by: Kai Vehmanen --- .../intel/common/soc-acpi-intel-lnl-match.c | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/sound/soc/intel/common/soc-acpi-intel-lnl-match.c b/sound/soc/intel/common/soc-acpi-intel-lnl-match.c index 98a9c36d7a4c..0b4a9c27c47e 100644 --- a/sound/soc/intel/common/soc-acpi-intel-lnl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-lnl-match.c @@ -91,6 +91,23 @@ static const struct snd_soc_acpi_endpoint rt722_endpoints[] = { }, }; +static const struct snd_soc_acpi_endpoint jack_dmic_endpoints[] = { + /* Jack Endpoint */ + { + .num = 0, + .aggregated = 0, + .group_position = 0, + .group_id = 0, + }, + /* DMIC Endpoint */ + { + .num = 1, + .aggregated = 0, + .group_position = 0, + .group_id = 0, + }, +}; + static const struct snd_soc_acpi_endpoint jack_amp_g1_dmic_endpoints_endpoints[] = { /* Jack Endpoint */ { @@ -295,6 +312,24 @@ static const struct snd_soc_acpi_adr_device rt1320_1_group1_adr[] = { } }; +static const struct snd_soc_acpi_adr_device rt1320_1_group2_adr[] = { + { + .adr = 0x000130025D132001ull, + .num_endpoints = 1, + .endpoints = &spk_l_endpoint, + .name_prefix = "rt1320-1" + } +}; + +static const struct snd_soc_acpi_adr_device rt1320_3_group2_adr[] = { + { + .adr = 0x000330025D132001ull, + .num_endpoints = 1, + .endpoints = &spk_r_endpoint, + .name_prefix = "rt1320-2" + } +}; + static const struct snd_soc_acpi_adr_device rt713_0_adr[] = { { .adr = 0x000031025D071301ull, @@ -304,6 +339,15 @@ static const struct snd_soc_acpi_adr_device rt713_0_adr[] = { } }; +static const struct snd_soc_acpi_adr_device rt713_vb_2_adr[] = { + { + .adr = 0x000230025d071301ull, + .num_endpoints = ARRAY_SIZE(jack_dmic_endpoints), + .endpoints = jack_dmic_endpoints, + .name_prefix = "rt713" + } +}; + static const struct snd_soc_acpi_adr_device rt714_0_adr[] = { { .adr = 0x000030025D071401ull, @@ -453,6 +497,25 @@ static const struct snd_soc_acpi_link_adr lnl_sdw_rt713_l0_rt1318_l1[] = { {} }; +static const struct snd_soc_acpi_link_adr lnl_sdw_rt713_vb_l2_rt1320_l13[] = { + { + .mask = BIT(2), + .num_adr = ARRAY_SIZE(rt713_vb_2_adr), + .adr_d = rt713_vb_2_adr, + }, + { + .mask = BIT(1), + .num_adr = ARRAY_SIZE(rt1320_1_group2_adr), + .adr_d = rt1320_1_group2_adr, + }, + { + .mask = BIT(3), + .num_adr = ARRAY_SIZE(rt1320_3_group2_adr), + .adr_d = rt1320_3_group2_adr, + }, + {} +}; + static const struct snd_soc_acpi_link_adr lnl_sdw_rt712_vb_l2_rt1320_l1[] = { { .mask = BIT(2), @@ -550,6 +613,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_sdw_machines[] = { .machine_check = snd_soc_acpi_intel_sdca_is_device_rt712_vb, .sof_tplg_filename = "sof-lnl-rt712-l2-rt1320-l1.tplg" }, + { + .link_mask = BIT(1) | BIT(2) | BIT(3), + .links = lnl_sdw_rt713_vb_l2_rt1320_l13, + .drv_name = "sof_sdw", + .machine_check = snd_soc_acpi_intel_sdca_is_device_rt712_vb, + .sof_tplg_filename = "sof-lnl-rt713-l2-rt1320-l13.tplg" + }, {}, }; EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_lnl_sdw_machines); From patchwork Fri Dec 6 07:59:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bard Liao X-Patchwork-Id: 13896599 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (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 619351DE3D9 for ; Fri, 6 Dec 2024 07:59:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733471967; cv=none; b=YY1twZTC3F0DUHON2uWyWZx23mfsJtzXf9fUXtuY+9mar4Pc8GcR/OCFlb1t4yHFd6qWBuiK3AKYejuQmVeKXvU7RB8ryyTB6wtvat5gLiwQ1jhZWP0odxguVzhA2V2YHpH5Q+vHLvvtloCI1S2SOnByJootbI6W2GmqFGIa+P8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733471967; c=relaxed/simple; bh=OZWo5ztAMGckN1p4cTSiDgVfOM4xN1isEsRzK6nnsz8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VDVzbT1APjbnnkijt6MSP8DZ36PipCL8tkXslwSMsn9Ob5F537JgGPQIkTVSaBni5CQoQN+R8+FaD529ozr1ngqAXnjHvaKQPFauTkJS2PfGQn0cIGQPoheiKygoxqC48rwyLrZbn0cErgEElKuTyw4g9dl91AVEfn066AXNHFM= 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=ftJJmoTj; arc=none smtp.client-ip=198.175.65.12 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="ftJJmoTj" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1733471965; x=1765007965; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OZWo5ztAMGckN1p4cTSiDgVfOM4xN1isEsRzK6nnsz8=; b=ftJJmoTj5sql17Se/nmMQp5ue3w5ZBY2KteJV7AFNWlygLYIew5zUHSe rTXry+ijPY9dfKm7+awfBG/8PRh3+PqRMywMt/GvDRKpk8b7t8c/wp1sd rRM8B/LMnKiMB0kMFIft6anxRLFWk9P1V6v/L085TATU2kqF3beOHrpsl k6XUCaAjNcOfLV50Gnd6BpYl4rWZl3anIGhh9/Q0+LlgDA4CpnCMCXn6O maPBPmJop+2NQNv5zVc7jkt7m1xfDkRF4CVWdRvH2eQISSW/8ifC3FgVK OPIu5qiLP7PY8ZL+U2J0t2XHVMHTlnU/5qArKL0LylmrZGIOXNCk7LzHY w==; X-CSE-ConnectionGUID: PK0BfACJRhq//jg9vA3XlA== X-CSE-MsgGUID: UJd5XNZ0Tia8MPBmYHIFZQ== X-IronPort-AV: E=McAfee;i="6700,10204,11277"; a="45192804" X-IronPort-AV: E=Sophos;i="6.12,212,1728975600"; d="scan'208";a="45192804" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Dec 2024 23:59:25 -0800 X-CSE-ConnectionGUID: hcNrblHgSMqD85WCbq8ZBQ== X-CSE-MsgGUID: S2LN5XxLQFmljvpHu10YTg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,212,1728975600"; d="scan'208";a="94144469" Received: from ssimmeri-mobl2.amr.corp.intel.com (HELO yungchua-desk.intel.com) ([10.124.220.179]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Dec 2024 23:59:24 -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 08/10] ASoC: Intel: soc-acpi-intel-ptl-match: add rt713_vb_l2_rt1320_l13 support Date: Fri, 6 Dec 2024 15:59:01 +0800 Message-ID: <20241206075903.195730-9-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241206075903.195730-1-yung-chuan.liao@linux.intel.com> References: <20241206075903.195730-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 Add rt713_vb on SoundWire link 2 and rt1320 on SoundWire link 1 and 3 configuration support. Signed-off-by: Bard Liao Reviewed-by: Liam Girdwood Reviewed-by: Kai Vehmanen --- .../intel/common/soc-acpi-intel-ptl-match.c | 77 +++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/sound/soc/intel/common/soc-acpi-intel-ptl-match.c b/sound/soc/intel/common/soc-acpi-intel-ptl-match.c index 573fae541db7..9eb4a43e3e7a 100644 --- a/sound/soc/intel/common/soc-acpi-intel-ptl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-ptl-match.c @@ -36,6 +36,13 @@ static const struct snd_soc_acpi_endpoint single_endpoint = { .group_id = 0, }; +static const struct snd_soc_acpi_endpoint spk_l_endpoint = { + .num = 0, + .aggregated = 1, + .group_position = 0, + .group_id = 1, +}; + static const struct snd_soc_acpi_endpoint spk_r_endpoint = { .num = 0, .aggregated = 1, @@ -68,6 +75,23 @@ static const struct snd_soc_acpi_endpoint rt_mf_endpoints[] = { }, }; +static const struct snd_soc_acpi_endpoint jack_dmic_endpoints[] = { + /* Jack Endpoint */ + { + .num = 0, + .aggregated = 0, + .group_position = 0, + .group_id = 0, + }, + /* DMIC Endpoint */ + { + .num = 1, + .aggregated = 0, + .group_position = 0, + .group_id = 0, + }, +}; + static const struct snd_soc_acpi_endpoint jack_amp_g1_dmic_endpoints_endpoints[] = { /* Jack Endpoint */ { @@ -110,6 +134,15 @@ static const struct snd_soc_acpi_adr_device rt712_vb_2_group1_adr[] = { } }; +static const struct snd_soc_acpi_adr_device rt713_vb_2_adr[] = { + { + .adr = 0x000230025d071301ull, + .num_endpoints = ARRAY_SIZE(jack_dmic_endpoints), + .endpoints = jack_dmic_endpoints, + .name_prefix = "rt713" + } +}; + static const struct snd_soc_acpi_adr_device rt721_3_single_adr[] = { { .adr = 0x000330025d072101ull, @@ -164,6 +197,24 @@ static const struct snd_soc_acpi_adr_device rt1320_1_group1_adr[] = { } }; +static const struct snd_soc_acpi_adr_device rt1320_1_group2_adr[] = { + { + .adr = 0x000130025D132001ull, + .num_endpoints = 1, + .endpoints = &spk_l_endpoint, + .name_prefix = "rt1320-1" + } +}; + +static const struct snd_soc_acpi_adr_device rt1320_3_group2_adr[] = { + { + .adr = 0x000330025D132001ull, + .num_endpoints = 1, + .endpoints = &spk_r_endpoint, + .name_prefix = "rt1320-2" + } +}; + static const struct snd_soc_acpi_link_adr ptl_rt722_only[] = { { .mask = BIT(0), @@ -200,6 +251,25 @@ static const struct snd_soc_acpi_link_adr ptl_rvp[] = { {} }; +static const struct snd_soc_acpi_link_adr lnl_sdw_rt713_vb_l2_rt1320_l13[] = { + { + .mask = BIT(2), + .num_adr = ARRAY_SIZE(rt713_vb_2_adr), + .adr_d = rt713_vb_2_adr, + }, + { + .mask = BIT(1), + .num_adr = ARRAY_SIZE(rt1320_1_group2_adr), + .adr_d = rt1320_1_group2_adr, + }, + { + .mask = BIT(3), + .num_adr = ARRAY_SIZE(rt1320_3_group2_adr), + .adr_d = rt1320_3_group2_adr, + }, + {} +}; + static const struct snd_soc_acpi_link_adr lnl_sdw_rt712_vb_l2_rt1320_l1[] = { { .mask = BIT(2), @@ -272,6 +342,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = { .machine_check = snd_soc_acpi_intel_sdca_is_device_rt712_vb, .sof_tplg_filename = "sof-lnl-rt712-l2-rt1320-l1.tplg" }, + { + .link_mask = BIT(1) | BIT(2) | BIT(3), + .links = lnl_sdw_rt713_vb_l2_rt1320_l13, + .drv_name = "sof_sdw", + .machine_check = snd_soc_acpi_intel_sdca_is_device_rt712_vb, + .sof_tplg_filename = "sof-lnl-rt713-l2-rt1320-l13.tplg" + }, {}, }; EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_ptl_sdw_machines); From patchwork Fri Dec 6 07:59:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bard Liao X-Patchwork-Id: 13896600 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (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 CC1461DE8AB for ; Fri, 6 Dec 2024 07:59:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733471968; cv=none; b=EqCe4ap+U4mbmRZnxkjtm2Ytdg3iGxWn7bRP+rODdSWhjkxRO317jQe6Ro5mEytmGcKRNJTskWrU8PO9SYeUD48mNSfGf1/CF61BEhSsItSL46bbuVgCLHUkd6MSq0DOSUYtMcp02B5TNXw4fhb6ssDJ+GTt/x593J8CJl6qbnE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733471968; c=relaxed/simple; bh=IUJBi6AIJlKpw4fH0P1/46hlM3D1HASLTE6dQADWyPk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=RlVt7LNZQCH6VJsEewPJUG2I1f1JKtR0Mm9d/ghUYpGMYcrD2WQJlW0PyrSjPL4h4Gefccxkw927eEgQJMM9sCySsmXroedlAMryHQco4phZCcrhu2fHTTgNaCD8yhAzxgvy6XTidIRKendlRwSTWA42MsdNUPeV5KS9udUzAjY= 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=b5gZp3Ko; arc=none smtp.client-ip=198.175.65.12 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="b5gZp3Ko" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1733471967; x=1765007967; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=IUJBi6AIJlKpw4fH0P1/46hlM3D1HASLTE6dQADWyPk=; b=b5gZp3KobjPTq6zuNy8IEbi75v/G08hKtPIH0DCt+EwSkMrXdVUgKnMq WSNUmh1Ul+IrB80foQw6HB2a2/PEvKlja5J/0tFoi7VLJ9ir4qh2P2/Qw 6dRk1XJZHXBca7h4JG30v97COeiG2MAq4dGSB9nLhQfTdx3MsC16kIRFZ xJWYg0mmni/p2y87GKE0DMvu3YT8ZIEeBvI2IzkdwcMBFmjxnV9iVoq/y hGg2f8oALtJhSj9ybJdxhYojbzILWDWlhUMvR98t4n8PjDxBwf6CNBGTW Nko+wfxd0k9dUrqdw7kivMsX8OLf/6ZJeyfiWyzSyUjcPJsvE0IYiJwpR g==; X-CSE-ConnectionGUID: cMAscQojSxOLJo0haYsWwQ== X-CSE-MsgGUID: IAkWFt4EQBWbDcoA+xCKJw== X-IronPort-AV: E=McAfee;i="6700,10204,11277"; a="45192808" X-IronPort-AV: E=Sophos;i="6.12,212,1728975600"; d="scan'208";a="45192808" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Dec 2024 23:59:26 -0800 X-CSE-ConnectionGUID: IxbDSYNuT++zziWAZqvhZw== X-CSE-MsgGUID: MuSB/EhjTiOrcBLU9w0t9Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,212,1728975600"; d="scan'208";a="94144481" Received: from ssimmeri-mobl2.amr.corp.intel.com (HELO yungchua-desk.intel.com) ([10.124.220.179]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Dec 2024 23:59:25 -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 09/10] ASoC: Intel: soc-acpi: arl: Correct naming of a cs35l56 address struct Date: Fri, 6 Dec 2024 15:59:02 +0800 Message-ID: <20241206075903.195730-10-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241206075903.195730-1-yung-chuan.liao@linux.intel.com> References: <20241206075903.195730-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: Simon Trimmer As there are many combinations these follow a naming scheme to make the content of link structures clearer: cs35l56___adr Signed-off-by: Simon Trimmer Reviewed-by: Péter Ujfalusi Reviewed-by: Liam Girdwood Signed-off-by: Bard Liao --- sound/soc/intel/common/soc-acpi-intel-arl-match.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/intel/common/soc-acpi-intel-arl-match.c b/sound/soc/intel/common/soc-acpi-intel-arl-match.c index 24d850df77ca..d7dfb23277d0 100644 --- a/sound/soc/intel/common/soc-acpi-intel-arl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-arl-match.c @@ -138,7 +138,7 @@ static const struct snd_soc_acpi_adr_device cs35l56_2_r1_adr[] = { }, }; -static const struct snd_soc_acpi_adr_device cs35l56_3_l1_adr[] = { +static const struct snd_soc_acpi_adr_device cs35l56_3_l3_adr[] = { { .adr = 0x00033301fa355601ull, .num_endpoints = 1, @@ -306,8 +306,8 @@ static const struct snd_soc_acpi_link_adr arl_cs42l43_l0_cs35l56_2_l23[] = { }, { .mask = BIT(3), - .num_adr = ARRAY_SIZE(cs35l56_3_l1_adr), - .adr_d = cs35l56_3_l1_adr, + .num_adr = ARRAY_SIZE(cs35l56_3_l3_adr), + .adr_d = cs35l56_3_l3_adr, }, {} }; From patchwork Fri Dec 6 07:59:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bard Liao X-Patchwork-Id: 13896601 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (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 2D22A1DE4C7 for ; Fri, 6 Dec 2024 07:59:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733471969; cv=none; b=HvHmdh3NyRD+uYs9tLzzQgRiH+TjKA4yrLAaNyvzjG1DURWdRWjINgkPj5YvCjVJXKVcVcpTGLQ5abHoitW7QJvVXr7DBKDRTl0rJLamZ9rGZ4JCBrzPlojwJ9M51LkVG1iTUzoQ/nKx7ASfUkwklH7phKfn6sy67tX97I5n/08= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733471969; c=relaxed/simple; bh=NQlOQCmZyfSUGMAGVnPqEb0LMuivFMfkmw/wY6hJVI4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GMZwbSZfsDdfiQhNLW7tM9f/ebTIWrH96Kakca0Op6m9ZlOq9in/HOG3BzP6+gufSLaMnQgcbsXBKnfYGdPu8T4CG3RRw4z9RZlV0wXfpxHWLVZh2mU+dS+jFzvb8q+Zf7fYIGjv2wted6QabF7Y9Veq4WAuMKbnWm5VdkhC82A= 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=X9r9UEIi; arc=none smtp.client-ip=198.175.65.12 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="X9r9UEIi" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1733471968; x=1765007968; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NQlOQCmZyfSUGMAGVnPqEb0LMuivFMfkmw/wY6hJVI4=; b=X9r9UEIiwaEbpZgMxkkABhG6Cv3tPS8jIGl7cL3YVknSMbsPlXsAbnmn dhKylurwYXRM36Un/n8xeEdXBCleTYrgDweM0oMfsXbnlmcj7SiklbZLs tE5h3XateXbHrBI3585dkbh3g+86OZATjJrdb6v1B+KolB9JvZhDkgayF ynyzI2w1xxFGQfLEGaz9RLBrwDz/pGw4iQMjKOns3W3RgLvyDh4GzwzPK igXarrMgQZLLm7aRCp1B6W8Fm9c1WBcRR2OV63neInYnUXzC0v/z0BIyY LCwa5cHX8/t86m73qMHbo3ol99XB0xjgz0OLxmnvC05FLjp8sT3Pi9P02 A==; X-CSE-ConnectionGUID: DGbc1GYFSvqi0WZfHE7xjw== X-CSE-MsgGUID: sTcsxTJpRLSfYN9Om4oeqg== X-IronPort-AV: E=McAfee;i="6700,10204,11277"; a="45192813" X-IronPort-AV: E=Sophos;i="6.12,212,1728975600"; d="scan'208";a="45192813" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Dec 2024 23:59:28 -0800 X-CSE-ConnectionGUID: 7m9yN0jWQNS1aTlx5aTd1g== X-CSE-MsgGUID: L9+ok9H8Qy2NyjEo7uIJ6w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,212,1728975600"; d="scan'208";a="94144494" Received: from ssimmeri-mobl2.amr.corp.intel.com (HELO yungchua-desk.intel.com) ([10.124.220.179]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Dec 2024 23:59:26 -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 10/10] ASoC: Intel: soc-acpi: arl: Add match entries for new cs42l43 laptops Date: Fri, 6 Dec 2024 15:59:03 +0800 Message-ID: <20241206075903.195730-11-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241206075903.195730-1-yung-chuan.liao@linux.intel.com> References: <20241206075903.195730-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: Simon Trimmer Add some new match table entries on Arrowlake for some coming cs42l43 laptops. Signed-off-by: Simon Trimmer Reviewed-by: Péter Ujfalusi Reviewed-by: Liam Girdwood Signed-off-by: Bard Liao --- .../intel/common/soc-acpi-intel-arl-match.c | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/sound/soc/intel/common/soc-acpi-intel-arl-match.c b/sound/soc/intel/common/soc-acpi-intel-arl-match.c index d7dfb23277d0..32147dc9d2d6 100644 --- a/sound/soc/intel/common/soc-acpi-intel-arl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-arl-match.c @@ -147,6 +147,24 @@ static const struct snd_soc_acpi_adr_device cs35l56_3_l3_adr[] = { }, }; +static const struct snd_soc_acpi_adr_device cs35l56_2_r3_adr[] = { + { + .adr = 0x00023301fa355601ull, + .num_endpoints = 1, + .endpoints = &spk_r_endpoint, + .name_prefix = "AMP2" + }, +}; + +static const struct snd_soc_acpi_adr_device cs35l56_3_l1_adr[] = { + { + .adr = 0x00033101fa355601ull, + .num_endpoints = 1, + .endpoints = &spk_l_endpoint, + .name_prefix = "AMP1" + }, +}; + static const struct snd_soc_acpi_endpoint cs42l43_endpoints[] = { { /* Jack Playback Endpoint */ .num = 0, @@ -312,6 +330,25 @@ static const struct snd_soc_acpi_link_adr arl_cs42l43_l0_cs35l56_2_l23[] = { {} }; +static const struct snd_soc_acpi_link_adr arl_cs42l43_l0_cs35l56_3_l23[] = { + { + .mask = BIT(0), + .num_adr = ARRAY_SIZE(cs42l43_0_adr), + .adr_d = cs42l43_0_adr, + }, + { + .mask = BIT(2), + .num_adr = ARRAY_SIZE(cs35l56_2_r3_adr), + .adr_d = cs35l56_2_r3_adr, + }, + { + .mask = BIT(3), + .num_adr = ARRAY_SIZE(cs35l56_3_l1_adr), + .adr_d = cs35l56_3_l1_adr, + }, + {} +}; + static const struct snd_soc_acpi_link_adr arl_rvp[] = { { .mask = BIT(0), @@ -406,6 +443,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_sdw_machines[] = { .drv_name = "sof_sdw", .sof_tplg_filename = "sof-arl-cs42l43-l0-cs35l56-l23.tplg", }, + { + .link_mask = BIT(0) | BIT(2) | BIT(3), + .links = arl_cs42l43_l0_cs35l56_3_l23, + .drv_name = "sof_sdw", + .sof_tplg_filename = "sof-arl-cs42l43-l0-cs35l56-l23.tplg", + }, { .link_mask = BIT(0) | BIT(2), .links = arl_cs42l43_l0_cs35l56_l2,