From patchwork Tue Mar 14 09:05:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bard Liao X-Patchwork-Id: 13173918 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 A0B82C6FD1F for ; Tue, 14 Mar 2023 08:53:55 +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 5A28A13BD; Tue, 14 Mar 2023 09:53:03 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 5A28A13BD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1678784033; bh=i6KnMw8XAxPNSupAHNWK1rxIAEacSnZ8EqNplUfddb4=; h=From:To:Subject:Date:In-Reply-To:References:CC:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=Dt4ifyDUWo6s0S/cmtPk8w4Y6V+kN1VGilSozKrxK/ygIp0L26SeDN7J9zvrZM6zQ JBpRaff5k/Q1TZUY9XIqPA4BOebpx9ykOwTCkMWyOyfUXXdvt1Q6PneMnlI43fduob hmdj5YBuv7XAQ1Wkfg00QU2JBFWm1MvDQtw5+Dis= Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 061B9F804FE; Tue, 14 Mar 2023 09:52:14 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id AD389F80425; Tue, 14 Mar 2023 09:52:11 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (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 E9F1EF80272 for ; Tue, 14 Mar 2023 09:52:05 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E9F1EF80272 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=YcF8kCLz DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678783927; x=1710319927; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=i6KnMw8XAxPNSupAHNWK1rxIAEacSnZ8EqNplUfddb4=; b=YcF8kCLzKczAV5zae6i/fBiVIOxsT6CDmkgWzOT6B+piSOqpIpWreyz0 zIC8fCwpgsRYaveyJgHLzIqSNZIY8WSiMwzlGcb7oJjfR+04rdVeUr62D AZSZg6+5OxNTADCkgPx3pZWuk+oSbziKReL6WD6NRjMRwaMzjV471r6FK v8P2zTorAPPFy2vX+0yS+tfZuOLgp5vdSVdwNsF9h7OWjHN1l2mZ0bTvW a2Gdd+4X9TTwolR/AR3k0ymmIo/8HnsLK1YI2EAtqTakEB+YhQqAezgt/ k+3T5OpJgQQ8jttjjKRj019A3fdEMY0CRj4Xvm6ZFi0SXwwjlkn0+4miR Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10648"; a="336060845" X-IronPort-AV: E=Sophos;i="5.98,259,1673942400"; d="scan'208";a="336060845" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Mar 2023 01:51:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10648"; a="711438071" X-IronPort-AV: E=Sophos;i="5.98,259,1673942400"; d="scan'208";a="711438071" Received: from bard-ubuntu.sh.intel.com ([10.239.185.57]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Mar 2023 01:51:50 -0700 From: Bard Liao To: broonie@kernel.org, tiwai@suse.de Subject: [PATCH 1/2] ASOC: Intel: sof_sdw: add quirk for Intel 'Rooks County' NUC M15 Date: Tue, 14 Mar 2023 17:05:52 +0800 Message-Id: <20230314090553.498664-2-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230314090553.498664-1-yung-chuan.liao@linux.intel.com> References: <20230314090553.498664-1-yung-chuan.liao@linux.intel.com> MIME-Version: 1.0 Message-ID-Hash: QGOC6HQ3C6KAGSK6XWADQDHLBN5PL62T X-Message-ID-Hash: QGOC6HQ3C6KAGSK6XWADQDHLBN5PL62T X-MailFrom: yung-chuan.liao@linux.intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: alsa-devel@alsa-project.org, pierre-louis.bossart@linux.intel.com, vkoul@kernel.org, bard.liao@intel.com, peter.ujfalusi@linux.intel.com, vinod.koul@linaro.org X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Eugene Huang Same quirks as the 'Bishop County' NUC M15, except the rt711 is in the 'JD2 100K' jack detection mode. Link: https://github.com/thesofproject/linux/issues/4088 Signed-off-by: Eugene Huang Reviewed-by: Pierre-Louis Bossart Reviewed-by: Péter Ujfalusi 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 d2ed807abde9..767fa89d0870 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -213,6 +213,17 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { SOF_SDW_PCH_DMIC | RT711_JD1), }, + { + /* NUC15 'Rooks County' LAPRC510 and LAPRC710 skews */ + .callback = sof_sdw_quirk_cb, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Intel(R) Client Systems"), + DMI_MATCH(DMI_PRODUCT_NAME, "LAPRC"), + }, + .driver_data = (void *)(SOF_SDW_TGL_HDMI | + SOF_SDW_PCH_DMIC | + RT711_JD2_100K), + }, /* TigerLake-SDCA devices */ { .callback = sof_sdw_quirk_cb, From patchwork Tue Mar 14 09:05:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bard Liao X-Patchwork-Id: 13173919 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 B181BC6FD1C for ; Tue, 14 Mar 2023 08:54:03 +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 997C013EC; Tue, 14 Mar 2023 09:53:11 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 997C013EC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1678784041; bh=ML4BML1OKhjlnRUQoQ6OI+3YQafSKj486n51EghHXxU=; h=From:To:Subject:Date:In-Reply-To:References:CC:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=UEBXxjXSJOKfxoCWXEEek6hheUMGQ5xgJRYKPVFWGjfYz5kffmzu7X1d3tiZdT2+M IMP+kzrFWMe5L1BlP1HUtZy10ihnZpTfuLcahuWLyC5FtmmalDm1FfUKChAbFAjhGZ VrxRnp8uwJcQY3+KHdMyLYhaP+EAl34ItAKi6FVk= Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 830CCF80529; Tue, 14 Mar 2023 09:52:17 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id C1A20F804FE; Tue, 14 Mar 2023 09:52:13 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (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 AAA40F8032D for ; Tue, 14 Mar 2023 09:52:07 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz AAA40F8032D 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=BIlo8jsw DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678783929; x=1710319929; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ML4BML1OKhjlnRUQoQ6OI+3YQafSKj486n51EghHXxU=; b=BIlo8jswRHLmaHO0twtTBwB29JLksxLOvAxXyvx/cbpa9L8zA/7z21oP sjZSTJmsNUZDf5wKtCTThN+Lxc5MqGJYa3siibvUcKeePP1x5igbB7qR2 ep7RaEjaA0AEHbVKMzo+FeHweXZVAewpKPfgeN9xcV546NmozvfaYIFXK Lhsz2HQqeWzkAYlUnA3N7q6ITCI7ftJI5XnTLB0za3kHZDwoPHJroSzHB JUxMrWPJC8FRLQR3rNITb1A4x/LC31QGhvm5Hj3MBmtP4qAau0gBfjt6r xMa6ibOkAOh+R7QyH089oUwWgakYSKT0A87tsesbIIe9gnoRcl6mCORay A==; X-IronPort-AV: E=McAfee;i="6500,9779,10648"; a="336060859" X-IronPort-AV: E=Sophos;i="5.98,259,1673942400"; d="scan'208";a="336060859" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Mar 2023 01:51:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10648"; a="711438082" X-IronPort-AV: E=Sophos;i="5.98,259,1673942400"; d="scan'208";a="711438082" Received: from bard-ubuntu.sh.intel.com ([10.239.185.57]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Mar 2023 01:51:52 -0700 From: Bard Liao To: broonie@kernel.org, tiwai@suse.de Subject: [PATCH 2/2] ASoC: Intel: soc-acpi: add table for Intel 'Rooks County' NUC M15 Date: Tue, 14 Mar 2023 17:05:53 +0800 Message-Id: <20230314090553.498664-3-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230314090553.498664-1-yung-chuan.liao@linux.intel.com> References: <20230314090553.498664-1-yung-chuan.liao@linux.intel.com> MIME-Version: 1.0 Message-ID-Hash: IVALZQBBR62BG3MBRSDTP6RX6RIIIIR7 X-Message-ID-Hash: IVALZQBBR62BG3MBRSDTP6RX6RIIIIR7 X-MailFrom: yung-chuan.liao@linux.intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: alsa-devel@alsa-project.org, pierre-louis.bossart@linux.intel.com, vkoul@kernel.org, bard.liao@intel.com, peter.ujfalusi@linux.intel.com, vinod.koul@linaro.org X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Eugene Huang Same topology as the HP Omen 16-k0005TX, except with the rt1316 amp on link2. Link: https://github.com/thesofproject/linux/issues/4088 Signed-off-by: Eugene Huang Reviewed-by: Pierre-Louis Bossart Reviewed-by: Péter Ujfalusi Signed-off-by: Bard Liao --- .../intel/common/soc-acpi-intel-adl-match.c | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c index 28dd2046e4ac..d8c80041388a 100644 --- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c @@ -354,6 +354,20 @@ static const struct snd_soc_acpi_link_adr adl_sdw_rt711_link0_rt1316_link3[] = { {} }; +static const struct snd_soc_acpi_link_adr adl_sdw_rt711_link0_rt1316_link2[] = { + { + .mask = BIT(0), + .num_adr = ARRAY_SIZE(rt711_sdca_0_adr), + .adr_d = rt711_sdca_0_adr, + }, + { + .mask = BIT(2), + .num_adr = ARRAY_SIZE(rt1316_2_single_adr), + .adr_d = rt1316_2_single_adr, + }, + {} +}; + static const struct snd_soc_acpi_adr_device mx8373_2_adr[] = { { .adr = 0x000223019F837300ull, @@ -624,6 +638,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[] = { .drv_name = "sof_sdw", .sof_tplg_filename = "sof-adl-rt711-l0-rt1316-l3.tplg", }, + { + .link_mask = 0x5, /* 2 active links required */ + .links = adl_sdw_rt711_link0_rt1316_link2, + .drv_name = "sof_sdw", + .sof_tplg_filename = "sof-adl-rt711-l0-rt1316-l2.tplg", + }, { .link_mask = 0x1, /* link0 required */ .links = adl_rvp,