From patchwork Fri Nov 11 04:50:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Liao, Bard" X-Patchwork-Id: 624243 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 EEFC7C4332F for ; Fri, 11 Nov 2022 04:50:26 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 252A9E12; Fri, 11 Nov 2022 05:49:35 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 252A9E12 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1668142225; bh=GwxIoWBJs1akwRhJErAev95xZAo1rcSWMNx/p00jW3g=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=tZTJaVZqED0Oi+c3UzbUwMyANgV58qoJD0MBYUpzeVbbEIQsC6/76UqXds4zzoiut 8wf1JlqburltDrO87QMPWF7O5ZvANSH+tfXCdk38d6OJW5/IUp0ynTlOQ+3uXetL54 6YzCyLctgH1U4zWvyX/elY1jT2c94xUBSFE758Ak= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 0FEA6F80557; Fri, 11 Nov 2022 05:48:50 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 9ECA4F80536; Fri, 11 Nov 2022 05:48:47 +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 F2CBEF800CC for ; Fri, 11 Nov 2022 05:48:40 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz F2CBEF800CC Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="V8wXcJr/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668142122; x=1699678122; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=GwxIoWBJs1akwRhJErAev95xZAo1rcSWMNx/p00jW3g=; b=V8wXcJr/8cBOtAVRMjpiEBF10Sycnn9TLNrm/Dy067eUWKp5NMPpMHXu 2uZb7N6p7srh285g80+bBsHkXVU0coEj6qRWh5Adh2HwW1yxafp/Z9lYF Af7Ps7ighTMIrXOUrji2Xs7usRBTVoS7SMPhEMnOwvC2Ec1qdSLCZyJR4 ByOkzOmQ+xoiF6ijM5UPtocbslHEeVMye+B2FpeZ9/kz95rN2QumUpL2W F8tWqkK9RKdveo5NCGc2+vRP7ktpYvbJ6eAHEowbhpBxcyyheR9B6yTpi 6Ac6UX7fgyHrdMGaasoSSF8n3eJKP2mojUpV++CGuHLShVwbDyXn6J6Rl A==; X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="311527610" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="311527610" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 20:48:28 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="706420072" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="706420072" Received: from bard-ubuntu.sh.intel.com ([10.239.185.57]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 20:48:26 -0800 From: Bard Liao To: broonie@kernel.org, tiwai@suse.de Subject: [PATCH 1/4] ASoC: Intel: sof_sdw: Add support for SKU 0C10 product Date: Fri, 11 Nov 2022 12:50:13 +0800 Message-Id: <20221111045016.46573-2-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221111045016.46573-1-yung-chuan.liao@linux.intel.com> References: <20221111045016.46573-1-yung-chuan.liao@linux.intel.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, peter.ujfalusi@linux.intel.com, pierre-louis.bossart@linux.intel.com, bard.liao@intel.com, ranjani.sridharan@linux.intel.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Gongjun Song SKU 0C10 product supports SoundWire capture from local microphone and two SoundWire amplifiers(no headset codec). Reviewed-by: Kai Vehmanen Reviewed-by: Péter Ujfalusi Signed-off-by: Gongjun Song Signed-off-by: Pierre-Louis Bossart Signed-off-by: Bard Liao --- sound/soc/intel/boards/sof_sdw.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index ee9857dc3135..ed4ca10b6710 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -355,6 +355,17 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { .driver_data = (void *)(SOF_SDW_TGL_HDMI | RT711_JD2), }, + /* RaptorLake devices */ + { + .callback = sof_sdw_quirk_cb, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"), + DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0C10"), + }, + /* No Jack */ + .driver_data = (void *)(SOF_SDW_TGL_HDMI | + SOF_SDW_FOUR_SPK), + }, /* MeteorLake devices */ { .callback = sof_sdw_quirk_cb, From patchwork Fri Nov 11 04:50:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Liao, Bard" X-Patchwork-Id: 623784 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 21DD5C4332F for ; Fri, 11 Nov 2022 04:50:00 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 5BBFF1664; Fri, 11 Nov 2022 05:49:08 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 5BBFF1664 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1668142198; bh=Eh38dgf3HL7ThcwJCjnQe+u8lgMO5mhrwLZ4lxDcpi4=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=mhiFqoIoI4zi9XCkNQz7gOVPATi8vVxke2i+Q5gNAzx+I1ajqcWts4p+31ehHcP8W UCZVcFBoD1byfn4xkS5B2dsft6XN4yWGTcLcUWzIFIwMUNzZz3o65hBNtcZWBwPYKS XSJbDbuxKOaaU8wS6D1HQy+82Z4EFIYRyg7oaPCM= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 37AFAF80249; Fri, 11 Nov 2022 05:48:48 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1A092F80548; Fri, 11 Nov 2022 05:48:46 +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 A4EDFF80249 for ; Fri, 11 Nov 2022 05:48:42 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A4EDFF80249 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="l/rfMK/P" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668142123; x=1699678123; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Eh38dgf3HL7ThcwJCjnQe+u8lgMO5mhrwLZ4lxDcpi4=; b=l/rfMK/PZJxDyDi9JN2p/w99Yy53wplrQHgG7lUCcOcXbUP+RaSLqWSk Za6xvZkdPayuVm3pGhUOMHUSdt/rXee1KbESXuiNksL/8i571vu+wbE+u kXVeZDOABKJGWQl5YM0VpMXICQ59bRX2FL+uWOb1wMUm2p/ilTGShJdhz MniU+fpoRDvKGy92SWYhccu3cxT58s/fD3AYFsjB07Xq5Xu0XDdPQkEcJ F3jT7aEisN+MZu3sbTXDxlj4SHIVXl695gefC7hbNjTkHNecrZx6iX0ln JhZ5CuPhm2ChAelwYWOvo/wcvpwYronUWLdQFTa258JbpRM5fL4L3DbWh Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="311527617" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="311527617" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 20:48:30 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="706420083" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="706420083" Received: from bard-ubuntu.sh.intel.com ([10.239.185.57]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 20:48:28 -0800 From: Bard Liao To: broonie@kernel.org, tiwai@suse.de Subject: [PATCH 2/4] ASoC: Intel: soc-acpi: add SKU 0C10 SoundWire configuration Date: Fri, 11 Nov 2022 12:50:14 +0800 Message-Id: <20221111045016.46573-3-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221111045016.46573-1-yung-chuan.liao@linux.intel.com> References: <20221111045016.46573-1-yung-chuan.liao@linux.intel.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, peter.ujfalusi@linux.intel.com, pierre-louis.bossart@linux.intel.com, bard.liao@intel.com, ranjani.sridharan@linux.intel.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Gongjun Song Audio hardware configuration of SKU 0C10 product is rt714 on link0, two rt1316s on link1 and link2 Reviewed-by: Kai Vehmanen Reviewed-by: Péter Ujfalusi Signed-off-by: Gongjun Song Signed-off-by: Pierre-Louis Bossart Signed-off-by: Bard Liao --- .../intel/common/soc-acpi-intel-rpl-match.c | 43 +++++++++++++++++++ 1 file changed, 43 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 9ccf7370157b..371333ed8c16 100644 --- a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c @@ -65,6 +65,15 @@ static const struct snd_soc_acpi_adr_device rt1316_1_group1_adr[] = { } }; +static const struct snd_soc_acpi_adr_device rt1316_2_group1_adr[] = { + { + .adr = 0x000230025D131601ull, + .num_endpoints = 1, + .endpoints = &spk_r_endpoint, + .name_prefix = "rt1316-2" + } +}; + static const struct snd_soc_acpi_adr_device rt1316_3_group1_adr[] = { { .adr = 0x000330025D131601ull, @@ -74,6 +83,15 @@ static const struct snd_soc_acpi_adr_device rt1316_3_group1_adr[] = { } }; +static const struct snd_soc_acpi_adr_device rt714_0_adr[] = { + { + .adr = 0x000030025D071401ull, + .num_endpoints = 1, + .endpoints = &single_endpoint, + .name_prefix = "rt714" + } +}; + static const struct snd_soc_acpi_adr_device rt714_2_adr[] = { { .adr = 0x000230025D071401ull, @@ -107,6 +125,25 @@ static const struct snd_soc_acpi_link_adr rpl_sdca_3_in_1[] = { {} }; +static const struct snd_soc_acpi_link_adr rpl_sdw_rt1316_link12_rt714_link0[] = { + { + .mask = BIT(1), + .num_adr = ARRAY_SIZE(rt1316_1_group1_adr), + .adr_d = rt1316_1_group1_adr, + }, + { + .mask = BIT(2), + .num_adr = ARRAY_SIZE(rt1316_2_group1_adr), + .adr_d = rt1316_2_group1_adr, + }, + { + .mask = BIT(0), + .num_adr = ARRAY_SIZE(rt714_0_adr), + .adr_d = rt714_0_adr, + }, + {} +}; + struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = { {}, }; @@ -120,6 +157,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_sdw_machines[] = { .drv_name = "sof_sdw", .sof_tplg_filename = "sof-rpl-rt711-l0-rt1316-l13-rt714-l2.tplg", }, + { + .link_mask = 0x7, /* rt714 on link0 & two rt1316s on link1 and link2 */ + .links = rpl_sdw_rt1316_link12_rt714_link0, + .drv_name = "sof_sdw", + .sof_tplg_filename = "sof-rpl-rt1316-l12-rt714-l0.tplg", + }, { .link_mask = 0x1, /* link0 required */ .links = rpl_rvp, From patchwork Fri Nov 11 04:50:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Liao, Bard" X-Patchwork-Id: 623783 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 4D223C433FE for ; Fri, 11 Nov 2022 04:50:40 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 689EA1673; Fri, 11 Nov 2022 05:49:40 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 689EA1673 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1668142230; bh=YPRBdDNUOGlStTKhUa/jj1rE7a3pJzaxL4y8+uqWuQM=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=cP2xXaHz6ddZQxZiIW5v4XapHEhd4BT0RC7Cf3zGc38z5BucOg9V0DLuHZBC7WQoe 18UC9Ol/juI0bm3Wov9cm77ggf0ieKyvuonrdrIN8W4AvJNKlALFWciAYwYZxo1D5Q bpVWw0h+BqV0GPB368kVN0+qTFRydjU0Yvw5UHbI= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 907A2F80559; Fri, 11 Nov 2022 05:48:52 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 42199F8055B; Fri, 11 Nov 2022 05:48:51 +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 F3C5DF800F8 for ; Fri, 11 Nov 2022 05:48:42 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz F3C5DF800F8 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="UvaSDxs8" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668142124; x=1699678124; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YPRBdDNUOGlStTKhUa/jj1rE7a3pJzaxL4y8+uqWuQM=; b=UvaSDxs8/ZP/mywTXRHu4d2AyCBduZM5e8FpTRMxtwNYsKEWAUhlf4Yj 0+7+vhR7o5TuFM8TSxK2dDG640Difnq47QM/+H/iLVfOKfJ8MNcsuk3ZP WFtgK4wYt0HKev9Ud9eiVS/CMvsxAIYigqF0Hny0YCvjCEztPvfLj3qkV Zya8FNT06VJosn3C3xPFFNmuAkippZz7sb1yYBgM/JZqEbQ2pvNykp0QE VXcfzmB/V5kLym9op/yAH2T5MkpUhiB0TBkGRTDg5NJG4ZB7qA1YPKeO+ xjo3V7F9qErtPl/Cy+wlc+oZhSx3EUZWRDR6P3IL6vs3F9Pkh2GQqpc9H w==; X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="311527623" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="311527623" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 20:48:32 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="706420111" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="706420111" Received: from bard-ubuntu.sh.intel.com ([10.239.185.57]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 20:48:30 -0800 From: Bard Liao To: broonie@kernel.org, tiwai@suse.de Subject: [PATCH 3/4] ASoC: Intel: sof_sdw: Add support for SKU 0C40 product Date: Fri, 11 Nov 2022 12:50:15 +0800 Message-Id: <20221111045016.46573-4-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221111045016.46573-1-yung-chuan.liao@linux.intel.com> References: <20221111045016.46573-1-yung-chuan.liao@linux.intel.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, peter.ujfalusi@linux.intel.com, pierre-louis.bossart@linux.intel.com, bard.liao@intel.com, ranjani.sridharan@linux.intel.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Gongjun Song SKU 0C40 product supports a SoundWire headset codec, SoundWire capture from local microphones and two SoundWire amplifiers. Reviewed-by: Kai Vehmanen Reviewed-by: Péter Ujfalusi Signed-off-by: Gongjun Song Signed-off-by: Pierre-Louis Bossart Signed-off-by: Bard Liao --- sound/soc/intel/boards/sof_sdw.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index ed4ca10b6710..47f743debc72 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -366,6 +366,16 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { .driver_data = (void *)(SOF_SDW_TGL_HDMI | SOF_SDW_FOUR_SPK), }, + { + .callback = sof_sdw_quirk_cb, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"), + DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0C40") + }, + .driver_data = (void *)(SOF_SDW_TGL_HDMI | + RT711_JD2 | + SOF_SDW_FOUR_SPK), + }, /* MeteorLake devices */ { .callback = sof_sdw_quirk_cb, From patchwork Fri Nov 11 04:50:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Liao, Bard" X-Patchwork-Id: 624242 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 5A342C4332F for ; Fri, 11 Nov 2022 04:50:46 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 8C2E5164D; Fri, 11 Nov 2022 05:49:54 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8C2E5164D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1668142244; bh=ozIZVppQw1cSA12mA20M7Dlv/zCe1+ntpdBGDqs7Eik=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=ZoiBucBL5mvejwBZRcR7YWrhfR3f0eJsYCYtSTGXK8XhUuI2/5jWUTIh1gFc+Ha7q 8MZ/oJLf8mpL+/n/aacTAgTtVinztK6y66RLimB1Mp5aWB1UgG1ZxJKFhx2bYO1Anj L07OJ7tv3YWRI17RoZ5uX4h3ITttNYYo3Hqvp8Mc= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 0AD46F80564; Fri, 11 Nov 2022 05:48:53 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6E64FF8055A; Fri, 11 Nov 2022 05:48:51 +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 8F5B7F8028D for ; Fri, 11 Nov 2022 05:48:44 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 8F5B7F8028D Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="FQkqdb3d" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668142125; x=1699678125; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ozIZVppQw1cSA12mA20M7Dlv/zCe1+ntpdBGDqs7Eik=; b=FQkqdb3dPuYFfZy8tIN05upec2MEGF9HFcZrKYQJvUdrHR9mX9XpBs4b RhJW4yZM2caHhGbm6GcbUcbnJWKiWVCgeTB6vdK4r1ZNznrElOICg5c+E XXhoN4e6nfxYmZ5ZsZEuRBiNxpCzG1idinnaumDqKVDU+U8iQdC/8BCbr 6Qa1KPbpnoUevxlnjWCmXCptfZf3iw62HjVbiO1zL9egSOzSNR6+96EMh r+BL3KKm6g1I6WcebeHMYhVKewLNQVkfX+168JGw9WUSG1qKusqOPLzEB l7QqbZWUNGf9QuH3bpt6wLtc8OBIRnyw0ykZVrbwAauFb3kYvM1bjUFJo A==; X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="311527629" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="311527629" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 20:48:34 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="706420119" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="706420119" Received: from bard-ubuntu.sh.intel.com ([10.239.185.57]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 20:48:32 -0800 From: Bard Liao To: broonie@kernel.org, tiwai@suse.de Subject: [PATCH 4/4] ASoC: Intel: soc-acpi: add SKU 0C40 SoundWire configuration Date: Fri, 11 Nov 2022 12:50:16 +0800 Message-Id: <20221111045016.46573-5-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221111045016.46573-1-yung-chuan.liao@linux.intel.com> References: <20221111045016.46573-1-yung-chuan.liao@linux.intel.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, peter.ujfalusi@linux.intel.com, pierre-louis.bossart@linux.intel.com, bard.liao@intel.com, ranjani.sridharan@linux.intel.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Gongjun Song Audio hardware configuration of SKU 0C40 product is rt711 on link2, two rt1316s on link0 and link1, rt714 on link 3. Reviewed-by: Kai Vehmanen Reviewed-by: Péter Ujfalusi Signed-off-by: Gongjun Song Signed-off-by: Pierre-Louis Bossart Signed-off-by: Bard Liao --- .../intel/common/soc-acpi-intel-rpl-match.c | 66 +++++++++++++++++++ 1 file changed, 66 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 371333ed8c16..7c2e94dcf8fc 100644 --- a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c @@ -56,6 +56,15 @@ static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] = { } }; +static const struct snd_soc_acpi_adr_device rt711_sdca_2_adr[] = { + { + .adr = 0x000230025D071101ull, + .num_endpoints = 1, + .endpoints = &single_endpoint, + .name_prefix = "rt711" + } +}; + static const struct snd_soc_acpi_adr_device rt1316_1_group1_adr[] = { { .adr = 0x000131025D131601ull, /* unique ID is set for some reason */ @@ -83,6 +92,24 @@ static const struct snd_soc_acpi_adr_device rt1316_3_group1_adr[] = { } }; +static const struct snd_soc_acpi_adr_device rt1316_0_group2_adr[] = { + { + .adr = 0x000030025D131601ull, + .num_endpoints = 1, + .endpoints = &spk_l_endpoint, + .name_prefix = "rt1316-1" + } +}; + +static const struct snd_soc_acpi_adr_device rt1316_1_group2_adr[] = { + { + .adr = 0x000131025D131601ull, + .num_endpoints = 1, + .endpoints = &spk_r_endpoint, + .name_prefix = "rt1316-2" + } +}; + static const struct snd_soc_acpi_adr_device rt714_0_adr[] = { { .adr = 0x000030025D071401ull, @@ -101,6 +128,15 @@ static const struct snd_soc_acpi_adr_device rt714_2_adr[] = { } }; +static const struct snd_soc_acpi_adr_device rt714_3_adr[] = { + { + .adr = 0x000330025D071401ull, + .num_endpoints = 1, + .endpoints = &single_endpoint, + .name_prefix = "rt714" + } +}; + static const struct snd_soc_acpi_link_adr rpl_sdca_3_in_1[] = { { .mask = BIT(0), @@ -125,6 +161,30 @@ static const struct snd_soc_acpi_link_adr rpl_sdca_3_in_1[] = { {} }; +static const struct snd_soc_acpi_link_adr rpl_sdw_rt711_link2_rt1316_link01_rt714_link3[] = { + { + .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, + }, + { + .mask = BIT(3), + .num_adr = ARRAY_SIZE(rt714_3_adr), + .adr_d = rt714_3_adr, + }, + {} +}; + static const struct snd_soc_acpi_link_adr rpl_sdw_rt1316_link12_rt714_link0[] = { { .mask = BIT(1), @@ -157,6 +217,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_sdw_machines[] = { .drv_name = "sof_sdw", .sof_tplg_filename = "sof-rpl-rt711-l0-rt1316-l13-rt714-l2.tplg", }, + { + .link_mask = 0xF, /* 4 active links required */ + .links = rpl_sdw_rt711_link2_rt1316_link01_rt714_link3, + .drv_name = "sof_sdw", + .sof_tplg_filename = "sof-rpl-rt711-l2-rt1316-l01-rt714-l3.tplg", + }, { .link_mask = 0x7, /* rt714 on link0 & two rt1316s on link1 and link2 */ .links = rpl_sdw_rt1316_link12_rt714_link0,