From patchwork Thu Nov 10 22:54:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre-Louis Bossart X-Patchwork-Id: 623342 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 C1E4FC433FE for ; Thu, 10 Nov 2022 22:56:23 +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 A644B1672; Thu, 10 Nov 2022 23:55:31 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A644B1672 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1668120981; bh=eijULDLbQoIzpU+j1Lp55bHrxPIQWmKTsB6zTH/LWXM=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=PF4fj0fvCNIHZcERTy6MMec890M+fbPWasNXY7pcbiNQago6RIY21tKZqvej2/o4N BRrGTf+rUx53CCnT/RVMau8kjxXKC1VZhBoAxZ6TCATlKN413EEYQsRAnnTc5zD6Zx /Cz7D0bwknLMEhI6WZYE6MWSCEf1nW2XAvrSwoSk= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 3550AF80162; Thu, 10 Nov 2022 23:55:12 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A7BEAF804FB; Thu, 10 Nov 2022 23:55:10 +0100 (CET) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) (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 1B649F80162 for ; Thu, 10 Nov 2022 23:55:03 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 1B649F80162 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Q6O9q78F" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668120905; x=1699656905; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eijULDLbQoIzpU+j1Lp55bHrxPIQWmKTsB6zTH/LWXM=; b=Q6O9q78FLRZgVMBMlxdfp9pb7pl4Yu6E6H2SN1BM5EUBpumeIXJrmLD6 su39O6PnbX4A/ixyKxbLpCiYnrJLRAf5pwpaahIAtnLftsD8CgVx7lSnI 8IXRUOgEv2mE80znfVhLG2emKnE4HZIc1OcDDmLK6eaUcdxcbADmXAioZ CIQTKt44lRJgEGNwctdVV8hp7ONqv4mrY7d9cBhOQ5eDewo2xBCPPbh0w DobQ4bClR4Qj3Eq/bKIAi3L+G9VT5mPvwg0Od+4cRn2OanGPtpDU3O4kl XjMh0LR3R7N46D6S11/2G3U6ec3kTRwPOzde12GyZQTZA7OI/8D7zO2cq Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="373588017" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="373588017" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 14:55:02 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="670533736" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="670533736" Received: from tleibov-mobl.ger.corp.intel.com (HELO pbossart-mobl3.intel.com) ([10.214.199.216]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 14:54:58 -0800 From: Pierre-Louis Bossart To: alsa-devel@alsa-project.org Subject: [PATCH 1/5] ASoC: Intel: sof_sdw: Add support for SKU 0C10 product Date: Thu, 10 Nov 2022 16:54:28 -0600 Message-Id: <20221110225432.144184-2-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221110225432.144184-1-pierre-louis.bossart@linux.intel.com> References: <20221110225432.144184-1-pierre-louis.bossart@linux.intel.com> MIME-Version: 1.0 Cc: Kai Vehmanen , tiwai@suse.de, Gongjun Song , =?utf-8?q?P=C3=A9ter_Ujfalusi?= , Pierre-Louis Bossart , broonie@kernel.org, Bard Liao 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: Bard Liao Reviewed-by: Péter Ujfalusi Signed-off-by: Gongjun Song Signed-off-by: Pierre-Louis Bossart --- 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 ee9857dc3135d..ed4ca10b67104 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 Thu Nov 10 22:54:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre-Louis Bossart X-Patchwork-Id: 623796 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 B3720C4332F for ; Thu, 10 Nov 2022 22:56:51 +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 6EB56164E; Thu, 10 Nov 2022 23:55:58 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 6EB56164E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1668121008; bh=kA0gsUDdNhGyjLzZQWVmWvgQaOpKF1Wxf0AS2wYJLpk=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=Nl4e8a0O9y4floPLi+48LY6EHE82f7lQieyqLtU7WX2H0Nb3LZ+GuH9LooA8X86Nr H3KUrwK76MIyCMbwrxJEMs+cbiENGrFie7Hh2zl8GT2kIJ4/zoSLFmSmHJcJyMgkBX HXGTKG4Fq06Y6/Q+WNji6b1wITsbvW/fCvfjYy/U= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id DFE2EF80557; Thu, 10 Nov 2022 23:55:18 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 4D224F80104; Thu, 10 Nov 2022 23:55:17 +0100 (CET) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) (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 9202FF80104 for ; Thu, 10 Nov 2022 23:55:09 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9202FF80104 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Z5Qsc3BP" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668120911; x=1699656911; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kA0gsUDdNhGyjLzZQWVmWvgQaOpKF1Wxf0AS2wYJLpk=; b=Z5Qsc3BP2VEqJm3Mwq0Ph3Ica0u8mB1Q3/syV3HAWxbH3yx0E7Rx1shx QDE+eEjizFIQPnPLtQ7K5Vs9IbxH3Gintlu7jiqIzjqbxGPZW0n4qz4gv j8zivm54iRl8Z+l2JsTNi9Dl2eIbjvh2U36ME2CRJrhlsAAn93ciqNyn9 rd1j1IfB7gKg5OcglGPuKLghTXqWhDZKcBMtq8NTcVcGnSx47OpqsQb+i 5lVMcsng/c9wN4hiXEdpMESXu0+J1jvhg5Gc4t86wBitlOfqYbodGXxhv ZtSFQCWtaidgmicKVMxnMCL3nocdjJIOr58XY5FJng39K0CoY8QaEDu1k A==; X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="373588029" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="373588029" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 14:55:07 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="670533766" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="670533766" Received: from tleibov-mobl.ger.corp.intel.com (HELO pbossart-mobl3.intel.com) ([10.214.199.216]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 14:55:03 -0800 From: Pierre-Louis Bossart To: alsa-devel@alsa-project.org Subject: [PATCH 2/5] ASoC: Intel: soc-acpi: add SKU 0C10 SoundWire configuration Date: Thu, 10 Nov 2022 16:54:29 -0600 Message-Id: <20221110225432.144184-3-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221110225432.144184-1-pierre-louis.bossart@linux.intel.com> References: <20221110225432.144184-1-pierre-louis.bossart@linux.intel.com> MIME-Version: 1.0 Cc: Kai Vehmanen , tiwai@suse.de, Gongjun Song , =?utf-8?q?P=C3=A9ter_Ujfalusi?= , Pierre-Louis Bossart , broonie@kernel.org, Bard Liao 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: Bard Liao Reviewed-by: Péter Ujfalusi Signed-off-by: Gongjun Song Signed-off-by: Pierre-Louis Bossart --- .../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 9ccf7370157b4..371333ed8c16c 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 Thu Nov 10 22:54:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre-Louis Bossart X-Patchwork-Id: 623341 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 EEAADC4332F for ; Thu, 10 Nov 2022 22:56:56 +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 2C5621680; Thu, 10 Nov 2022 23:56:05 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 2C5621680 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1668121015; bh=VGlH5GhfLEic8kRjr4021dFEJa7G0hebO9wt5hfWNiI=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=bfinO7o+KS94HVomt51DNuQ1gVeLhsalp7DzhlHXlzgDlX9Ipj6DhuUDLjzF0LHtF qGo34bXJ493ePZ/LBaVKa0NSrQ9kFyDZl8vBtADbvGn6dZq0bq0iaHezfSPnizOmm2 RhqEk8FAmUpKIdcGQBSdnlRmqLttumglfxffI54k= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 11B28F80566; Thu, 10 Nov 2022 23:55:21 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 8F8A9F8055A; Thu, 10 Nov 2022 23:55:19 +0100 (CET) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) (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 1D5C5F80548 for ; Thu, 10 Nov 2022 23:55:12 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 1D5C5F80548 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="nqxqHyw3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668120914; x=1699656914; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=VGlH5GhfLEic8kRjr4021dFEJa7G0hebO9wt5hfWNiI=; b=nqxqHyw3W5gdEDPHNX+/2rbnoPWkJOKv8IgWLtICe/6R73vfk3Q3H5L1 jhhiux1S7mq7lszcF0aEkYkYGdoWycVkGii3bUPXNbHFWx8nADORhrd1N WR2NaA8LdH360vu7nHyJrCS9/4w/8CjiflPTTet33nUnHo4Nii8PGIM96 bH0G354uYSnn4dxINe0lD2zhOK9MCsE/HdQjIK/rfC/DJy9gTkUOdMV1C GFIRA18ge2NhygOMYw5r0fADrOCBTOXTDC3XVLTv2BztjdQCeOmYCE4XC Ddu9+IYewnlO6d5AEjwDDA+zyMldP3prwCHQV4RsuNURKlCS1QSCX2CkT g==; X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="373588041" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="373588041" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 14:55:12 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="670533797" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="670533797" Received: from tleibov-mobl.ger.corp.intel.com (HELO pbossart-mobl3.intel.com) ([10.214.199.216]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 14:55:08 -0800 From: Pierre-Louis Bossart To: alsa-devel@alsa-project.org Subject: [PATCH 3/5] ASoC: Intel: sof_sdw: Add support for SKU 0C40 product Date: Thu, 10 Nov 2022 16:54:30 -0600 Message-Id: <20221110225432.144184-4-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221110225432.144184-1-pierre-louis.bossart@linux.intel.com> References: <20221110225432.144184-1-pierre-louis.bossart@linux.intel.com> MIME-Version: 1.0 Cc: Kai Vehmanen , tiwai@suse.de, Gongjun Song , =?utf-8?q?P=C3=A9ter_Ujfalusi?= , Pierre-Louis Bossart , broonie@kernel.org, Bard Liao 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: Bard Liao Reviewed-by: Péter Ujfalusi Signed-off-by: Gongjun Song Signed-off-by: Pierre-Louis Bossart --- 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 ed4ca10b67104..47f743debc72c 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 Thu Nov 10 22:54:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre-Louis Bossart X-Patchwork-Id: 623795 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 14E09C433FE for ; Thu, 10 Nov 2022 22:57:11 +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 4F2EF1661; Thu, 10 Nov 2022 23:56:19 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 4F2EF1661 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1668121029; bh=Q6zkWdQl9uZzhq9hHvU6ua5XmX2oWWroce2WmxQvPVA=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=VdajDJV3v92doJ8s8vEfAMN79itbDA7m0j/RiYz5/LjbUlWNjmO0+PgJggANWbVSN MDoLdPvoR0Lk/BA9FzMsPRGUzlSJozX9r9YhFQ99rb3BWN70MeE+DQiliNSGu7oF3Y bVQMK047o/U/eHfwanH1YQp5Fi0C0lrnocbtdFBo= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 9D45FF80570; Thu, 10 Nov 2022 23:55:26 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id BEC29F80571; Thu, 10 Nov 2022 23:55:24 +0100 (CET) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) (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 DF532F804FB for ; Thu, 10 Nov 2022 23:55:17 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz DF532F804FB Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="c3TMwVDS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668120919; x=1699656919; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Q6zkWdQl9uZzhq9hHvU6ua5XmX2oWWroce2WmxQvPVA=; b=c3TMwVDSPoIob5qR5RDmre77lDRWAa+GcPgmTXZvVfqVeeddCulVlOYZ 0oirwLNGxE36F5Z0j3nIHAI+MZInz/VtXZJ8/jloxxaGcCPSNAt1zuELk IbAyGc+TUsAVtDl7Wu3ehQhE5a0M5EQp+nnbZjTL1GQDgB8zwTqcWpi9l p91FEdkttUnAScEzQMXVCDyVvtit9h2gKkiOjjBAIi/hNaFl6zbGrbR31 h1I/biUEn6ktWGHie1t+JOrPtD+cmpTuQeEOz11vZVv445GA7yrwJINXl vqZcwikRifGuyKRi3vbSftKAx/YdVtD6961eDukCAw7jkta4TeD0UachC w==; X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="373588056" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="373588056" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 14:55:17 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="670533857" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="670533857" Received: from tleibov-mobl.ger.corp.intel.com (HELO pbossart-mobl3.intel.com) ([10.214.199.216]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 14:55:12 -0800 From: Pierre-Louis Bossart To: alsa-devel@alsa-project.org Subject: [PATCH 4/5] ASoC: Intel: soc-acpi: add SKU 0C40 SoundWire configuration Date: Thu, 10 Nov 2022 16:54:31 -0600 Message-Id: <20221110225432.144184-5-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221110225432.144184-1-pierre-louis.bossart@linux.intel.com> References: <20221110225432.144184-1-pierre-louis.bossart@linux.intel.com> MIME-Version: 1.0 Cc: Kai Vehmanen , tiwai@suse.de, Gongjun Song , =?utf-8?q?P=C3=A9ter_Ujfalusi?= , Pierre-Louis Bossart , broonie@kernel.org, Bard Liao 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: Bard Liao Reviewed-by: Péter Ujfalusi Signed-off-by: Gongjun Song Signed-off-by: Pierre-Louis Bossart --- .../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 371333ed8c16c..7c2e94dcf8fc3 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, From patchwork Thu Nov 10 22:54:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Louis Bossart X-Patchwork-Id: 623340 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 11F00C433FE for ; Thu, 10 Nov 2022 22:57:28 +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 44E10166F; Thu, 10 Nov 2022 23:56:36 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 44E10166F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1668121046; bh=riN9NFnj4G44zUFscgOxHNMFJVohdHE8Kz1q5V8KtCk=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=PZ7quXMb25u3qHm7Foyl6LGCdhxZa8zhgQ4tY3GyvkValDHHMyyjoWlubuQIJkrkH myDYZ7OJKGCDbBpI9XhqyTrQrYnRq0eAUvZOzt79VEwjYya2H++STCz4iagqAhv4bZ LMSD2n2kpzt85d66dBAvPNm3zB3I7NJVqJ3zZlRo= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 1E86BF80579; Thu, 10 Nov 2022 23:55:30 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 536B5F8057A; Thu, 10 Nov 2022 23:55:29 +0100 (CET) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) (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 AB18FF8055A for ; Thu, 10 Nov 2022 23:55:22 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz AB18FF8055A Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="PW53Yxuw" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668120923; x=1699656923; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=riN9NFnj4G44zUFscgOxHNMFJVohdHE8Kz1q5V8KtCk=; b=PW53YxuwD4etuEi3OgZzDTeBhvD8G8Ja1bXyzhDEaWoQwIdzzCmSwUl+ d+MiUtgtnAdEG1YR43IOYPGlcCL1AeOJw5mQmIUbhU1+SvVYWXBOmD8Sr bvNHMPlyzJhCyh2fcPq1ps0T8QOrVgk6a5Jnxc9ijdN0cM3p5lPSmI9wF +2Rq/C0rZnuRGNuYairkDsAamftEE5Ax3nO67ueZLGFhstDiS1oi8XgaC K6IoParQUn2otuR4csicBg3gIYv0tp4TZ8SWj9HtjFYhcBcwwQaOV4q7R Any1pJV+l9Z5+XkNw4SB7x58Lqkbjj6Pv5eE4OuyLDlZ/LtpfBGiLgovm Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="373588069" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="373588069" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 14:55:22 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="670533897" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="670533897" Received: from tleibov-mobl.ger.corp.intel.com (HELO pbossart-mobl3.intel.com) ([10.214.199.216]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 14:55:17 -0800 From: Pierre-Louis Bossart To: alsa-devel@alsa-project.org Subject: [PATCH 5/5] ASoC: Intel: soc-acpi: add MTL AIC SoundWire configurations Date: Thu, 10 Nov 2022 16:54:32 -0600 Message-Id: <20221110225432.144184-6-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221110225432.144184-1-pierre-louis.bossart@linux.intel.com> References: <20221110225432.144184-1-pierre-louis.bossart@linux.intel.com> MIME-Version: 1.0 Cc: Jairaj Arava , tiwai@suse.de, Ranjani Sridharan , Pierre-Louis Bossart , broonie@kernel.org, Bard Liao , Yong Zhi 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: Yong Zhi Add support to the following daughter card: SDW0: MX98373 Speaker SDW2: ALC5682 Headset Share same driver data used by sof_sdw driver for mtlrvp. Reviewed-by: Ranjani Sridharan Reviewed-by: Bard Liao Signed-off-by: Yong Zhi Signed-off-by: Jairaj Arava Signed-off-by: Pierre-Louis Bossart --- .../intel/common/soc-acpi-intel-mtl-match.c | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c index 36c361fb28a4d..b1a66a0f68181 100644 --- a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c @@ -39,6 +39,20 @@ 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, + .group_position = 1, + .group_id = 1, +}; + static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] = { { .adr = 0x000030025D071101ull, @@ -48,6 +62,45 @@ static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] = { } }; +static const struct snd_soc_acpi_adr_device mx8373_0_adr[] = { + { + .adr = 0x000023019F837300ull, + .num_endpoints = 1, + .endpoints = &spk_l_endpoint, + .name_prefix = "Left" + }, + { + .adr = 0x000027019F837300ull, + .num_endpoints = 1, + .endpoints = &spk_r_endpoint, + .name_prefix = "Right" + } +}; + +static const struct snd_soc_acpi_adr_device rt5682_2_adr[] = { + { + .adr = 0x000221025D568200ull, + .num_endpoints = 1, + .endpoints = &single_endpoint, + .name_prefix = "rt5682" + } +}; + +static const struct snd_soc_acpi_link_adr rt5682_link2_max98373_link0[] = { + /* Expected order: jack -> amp */ + { + .mask = BIT(2), + .num_adr = ARRAY_SIZE(rt5682_2_adr), + .adr_d = rt5682_2_adr, + }, + { + .mask = BIT(0), + .num_adr = ARRAY_SIZE(mx8373_0_adr), + .adr_d = mx8373_0_adr, + }, + {} +}; + static const struct snd_soc_acpi_link_adr mtl_rvp[] = { { .mask = BIT(0), @@ -84,6 +137,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = { .drv_name = "sof_sdw", .sof_tplg_filename = "sof-mtl-rt711.tplg", }, + { + .link_mask = BIT(0) | BIT(2), + .links = rt5682_link2_max98373_link0, + .drv_name = "sof_sdw", + .sof_tplg_filename = "sof-mtl-sdw-rt5682-l2-max98373-l0.tplg", + }, {}, }; EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_mtl_sdw_machines);