From patchwork Mon Dec 26 01:09:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liao, Bard" X-Patchwork-Id: 636977 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A61FEC4167B for ; Mon, 26 Dec 2022 01:04:00 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 0592B5582; Mon, 26 Dec 2022 02:03:08 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0592B5582 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1672016638; bh=RsmiUjpT/vcAsulXzr37tHeDg54prpDpKNSyMsLu3bE=; h=From:To:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:Cc:From; b=RtXv29ZmQ+6EB/JpwoyCGfwzevVIzL2wVe2Kf0hUXzJFCTdjVlyQ3Z+QUF1G4lp8j s6HeI5Z/E1GDeyRwREQyI1sx1dVc7j/westBr4yHUO27drMOD4e+qLAKMowli/lpPc vbLGKvYWe8PTRtIRwFJp4T5VAYeaouAYyqee/FLQ= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id A4957F804B0; Mon, 26 Dec 2022 02:03:07 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 25D05F800F0; Mon, 26 Dec 2022 02:03:06 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 6979AF800F0 for ; Mon, 26 Dec 2022 02:03:01 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 6979AF800F0 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=DTcEx1NL DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672016583; x=1703552583; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=RsmiUjpT/vcAsulXzr37tHeDg54prpDpKNSyMsLu3bE=; b=DTcEx1NLTS7DnSWrTlmE7Wd9+6QdGNbMXxhYYfjV0WlFiBHOpoHGklG2 eDfRSNSlOTykOzLpMknoYJoHeJOp2vo7FB/rDrmdbAaC4c4HJS9eCxKOV YLe6UDQ3SVKe4MkaDqa6kdHElOPEjX7ZYsAS1HSrqmPR4DSpXmzKqwirU eXKRU8APM97U7u5nwMEL84Sqoo+XGozZ8Qt/9tjodbRMApbdrn/vCN4lS PKyY5gzParEOdTeg2EcmDJZBtydMwdL1PaZQNJ/Fd+HOrJA7PCMYKaCy5 5LWWH0wdieNHAVpKiKlJx6voArSTVMpEPs7s1sbEMDP5N+GE8ijitjLGS g==; X-IronPort-AV: E=McAfee;i="6500,9779,10571"; a="320591405" X-IronPort-AV: E=Sophos;i="5.96,274,1665471600"; d="scan'208";a="320591405" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Dec 2022 17:02:57 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10571"; a="741354808" X-IronPort-AV: E=Sophos;i="5.96,274,1665471600"; d="scan'208";a="741354808" Received: from bard-ubuntu.sh.intel.com ([10.239.185.57]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Dec 2022 17:02:55 -0800 From: Bard Liao To: broonie@kernel.org, tiwai@suse.de Subject: [PATCH 1/2] ASoC: Intel: soc-acpi: add configuration for variant of 0C40 product Date: Mon, 26 Dec 2022 09:09:16 +0800 Message-Id: <20221226010917.2632973-1-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, Zorro.Zhang@dell.com, pierre-louis.bossart@linux.intel.com, ranjani.sridharan@linux.intel.com, peter.ujfalusi@linux.intel.com, bard.liao@intel.com Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Gongjun Song Support configuration with SoundWire RT1316 amplifiers on link0 and link1, and RT711 on link2 for headphone/headset. This product does not support local microphones. Signed-off-by: Gongjun Song Signed-off-by: Bard Liao --- .../intel/common/soc-acpi-intel-rpl-match.c | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c index 31b43116e3d8..c70d85bfedbf 100644 --- a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c @@ -203,6 +203,25 @@ static const struct snd_soc_acpi_link_adr rpl_sdw_rt711_link2_rt1316_link01_rt71 {} }; +static const struct snd_soc_acpi_link_adr rpl_sdw_rt711_link2_rt1316_link01[] = { + { + .mask = BIT(2), + .num_adr = ARRAY_SIZE(rt711_sdca_2_adr), + .adr_d = rt711_sdca_2_adr, + }, + { + .mask = BIT(0), + .num_adr = ARRAY_SIZE(rt1316_0_group2_adr), + .adr_d = rt1316_0_group2_adr, + }, + { + .mask = BIT(1), + .num_adr = ARRAY_SIZE(rt1316_1_group2_adr), + .adr_d = rt1316_1_group2_adr, + }, + {} +}; + static const struct snd_soc_acpi_link_adr rpl_sdw_rt711_link0_rt1318_link12_rt714_link3[] = { { .mask = BIT(0), @@ -277,6 +296,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_sdw_machines[] = { .drv_name = "sof_sdw", .sof_tplg_filename = "sof-rpl-rt1316-l12-rt714-l0.tplg", }, + { + .link_mask = 0x7, /* rt711 on link2 & two rt1316s on link0 and link1 */ + .links = rpl_sdw_rt711_link2_rt1316_link01, + .drv_name = "sof_sdw", + .sof_tplg_filename = "sof-rpl-rt711-l2-rt1316-l01.tplg", + }, { .link_mask = 0x1, /* link0 required */ .links = rpl_rvp, From patchwork Mon Dec 26 01:09:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liao, Bard" X-Patchwork-Id: 636837 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 93A08C3DA7A for ; Mon, 26 Dec 2022 01:04:24 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 60E21559D; Mon, 26 Dec 2022 02:03:32 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 60E21559D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1672016662; bh=JjFSG1BDIJv1r04bLzwhzg7wvOZH5XSDf1NV+bPK0JY=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=apdA4i8yE3A1eYZ6DOlyZGfGOKPeRM/cTT7nJojoqFnJuIU3FTs6CbYgbjigSRHan MZ976GyrfMnUhLOHfFqBWfRvnIYn6ZEL0tdOLPJi4rPugCtEePnC08+97kplRKsU+H ka2OtFjASkZXOWNWt+6/ZInllGJQIeKCWEfc0Tk0= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id A70FCF804F1; Mon, 26 Dec 2022 02:03:10 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D901FF804B0; Mon, 26 Dec 2022 02:03:06 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 5F356F804B0 for ; Mon, 26 Dec 2022 02:03:04 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5F356F804B0 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=MxfeSM6D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672016585; x=1703552585; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JjFSG1BDIJv1r04bLzwhzg7wvOZH5XSDf1NV+bPK0JY=; b=MxfeSM6DYxdGRoooRuZ9JPrR/D8RrZn6WZF/rWX2MJpHhEUr9rNyJ8P2 0yYVcSXIVRpgLghb6ifp/A7VCFZ21wOF3mBTnC/mJtdkcudPPHyI9kdGu odESfsMjxaQ/UfDpYkDuTCw6/7jb1yZeOsCvW7wfdR3BzV9XoZhvKIots 2gULdDSbAGs1YeBlwEktJdlRtLFbQ3JsyMMdLy6LOT+N+JM5G0CztQDvK 8Jcv8plmYlseOTMGzEvttlfJCuf2eRLeIZchPqCV7G//HCmBGFnMqSVU9 Mqz0llUcOtvXqVyHf11noOJn2SFBGGPTbBTAbOlYNLkao29YCSfmv0qEr Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10571"; a="320591413" X-IronPort-AV: E=Sophos;i="5.96,274,1665471600"; d="scan'208";a="320591413" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Dec 2022 17:03:00 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10571"; a="741354821" X-IronPort-AV: E=Sophos;i="5.96,274,1665471600"; d="scan'208";a="741354821" Received: from bard-ubuntu.sh.intel.com ([10.239.185.57]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Dec 2022 17:02:57 -0800 From: Bard Liao To: broonie@kernel.org, tiwai@suse.de Subject: [PATCH 2/2] ASoC: Intel: soc-acpi: add configuration for variant of 0C11 product Date: Mon, 26 Dec 2022 09:09:17 +0800 Message-Id: <20221226010917.2632973-2-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221226010917.2632973-1-yung-chuan.liao@linux.intel.com> References: <20221226010917.2632973-1-yung-chuan.liao@linux.intel.com> MIME-Version: 1.0 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, Zorro.Zhang@dell.com, pierre-louis.bossart@linux.intel.com, ranjani.sridharan@linux.intel.com, peter.ujfalusi@linux.intel.com, bard.liao@intel.com Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Gongjun Song Support configuration with SoundWire RT1318 amplifiers on link1 and link2, and RT711 on link0 for headphone/headset. This product does not support local microphones. Signed-off-by: Gongjun Song Signed-off-by: Bard Liao --- .../intel/common/soc-acpi-intel-rpl-match.c | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c index c70d85bfedbf..07f96a11ea2f 100644 --- a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c @@ -246,6 +246,25 @@ static const struct snd_soc_acpi_link_adr rpl_sdw_rt711_link0_rt1318_link12_rt71 {} }; +static const struct snd_soc_acpi_link_adr rpl_sdw_rt711_link0_rt1318_link12[] = { + { + .mask = BIT(0), + .num_adr = ARRAY_SIZE(rt711_sdca_0_adr), + .adr_d = rt711_sdca_0_adr, + }, + { + .mask = BIT(1), + .num_adr = ARRAY_SIZE(rt1318_1_group1_adr), + .adr_d = rt1318_1_group1_adr, + }, + { + .mask = BIT(2), + .num_adr = ARRAY_SIZE(rt1318_2_group1_adr), + .adr_d = rt1318_2_group1_adr, + }, + {} +}; + static const struct snd_soc_acpi_link_adr rpl_sdw_rt1316_link12_rt714_link0[] = { { .mask = BIT(1), @@ -290,6 +309,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_sdw_machines[] = { .drv_name = "sof_sdw", .sof_tplg_filename = "sof-rpl-rt711-l0-rt1318-l12-rt714-l3.tplg", }, + { + .link_mask = 0x7, /* rt711 on link0 & two rt1318s on link1 and link2 */ + .links = rpl_sdw_rt711_link0_rt1318_link12, + .drv_name = "sof_sdw", + .sof_tplg_filename = "sof-rpl-rt711-l0-rt1318-l12.tplg", + }, { .link_mask = 0x7, /* rt714 on link0 & two rt1316s on link1 and link2 */ .links = rpl_sdw_rt1316_link12_rt714_link0,