From patchwork Thu Nov 30 10:20:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1870039 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Sgsfx3l5Pz1ySd for ; Thu, 30 Nov 2023 21:21:29 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1r8eAY-0003sb-1v; Thu, 30 Nov 2023 10:21:18 +0000 Received: from mail-pl1-f172.google.com ([209.85.214.172]) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1r8eAR-0003rB-Eg for kernel-team@lists.ubuntu.com; Thu, 30 Nov 2023 10:21:11 +0000 Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1cfc1512df1so6693615ad.2 for ; Thu, 30 Nov 2023 02:21:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701339669; x=1701944469; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=L239n9YSXSZVu3vqIONms9jX8tBswHx2BpU4TZZMDcY=; b=NbsoWi2MlM66AYCbJ7z1yMbIZGnVZosz0gZcL1+Q82WcK+8UtSEdL/olLaG2czxsL4 AG8IA4u9GFC60h/LyqqtuHSKF6LQYn7UcEwz+GPJ46/o92TGwOWBD5aNGSwSR9aC8w34 tkd6Vd6VhyJ3+Hi5mava6wPFas+DwHwi04TgWcFD5Tm4DHszqvY2cCF/hgOnVB2x3BIX T2l3WB6ymYpo/y+KXm8pkcESwce3KUm0MFL6RPleSSmU3JeF+/aj7j4oiJCH+o1aYIwX t6TwtV5S5xhwObLlcowiUfIuKBiZunfo1zAjCBBhnftCM9qAQgStD5mhZ9tZRpQlm3W0 junw== X-Gm-Message-State: AOJu0YydGOIdp01tTcX/iQlzmMb3uH4f48Uo4X0HWU5iHFsk1YWSWmZU jmhew6Oo2C/R0dirI/DmeHijWZdANb780w== X-Google-Smtp-Source: AGHT+IG9OSJs82LUuVZX65b2wO0sdGjv1kOKRD6hmsUQvuZxixQuObf3ba0UQl7bzBNUk6Ky3BBSVA== X-Received: by 2002:a17:902:7005:b0:1cf:d795:5e4a with SMTP id y5-20020a170902700500b001cfd7955e4amr10267639plk.15.1701339668929; Thu, 30 Nov 2023 02:21:08 -0800 (PST) Received: from localhost.localdomain (125-229-129-140.hinet-ip.hinet.net. [125.229.129.140]) by smtp.gmail.com with ESMTPSA id ij24-20020a170902ab5800b001cfcf0fcc4esm983476plb.304.2023.11.30.02.21.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 02:21:08 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/4][SRU][Mantic] ASoC: Intel: soc-acpi-intel-mtl-match: add rt713 rt1316 config Date: Thu, 30 Nov 2023 18:20:27 +0800 Message-Id: <20231130102030.2407035-2-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231130102030.2407035-1-vicamo.yang@canonical.com> References: <20231130102030.2407035-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.214.172; envelope-from=vicamo@gmail.com; helo=mail-pl1-f172.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Bard Liao BugLink: https://bugs.launchpad.net/bugs/2042090 Adding rt713 jack + rt1316 amp + rt1713 dmic configuration support. Reviewed-by: Rander Wang Signed-off-by: Bard Liao Signed-off-by: Pierre-Louis Bossart Link: https://lore.kernel.org/r/20231012190826.142619-4-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown (cherry picked from commit e70ca580e9c8d59bc8cf70cb15546da5aecff3a0) Signed-off-by: You-Sheng Yang --- .../intel/common/soc-acpi-intel-mtl-match.c | 66 +++++++++++++++++++ 1 file changed, 66 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 0304246d29223..2e210c24edb28 100644 --- a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c @@ -119,6 +119,24 @@ static const struct snd_soc_acpi_adr_device rt1712_3_single_adr[] = { } }; +static const struct snd_soc_acpi_adr_device rt713_0_single_adr[] = { + { + .adr = 0x000031025D071301ull, + .num_endpoints = 1, + .endpoints = &single_endpoint, + .name_prefix = "rt713" + } +}; + +static const struct snd_soc_acpi_adr_device rt1713_3_single_adr[] = { + { + .adr = 0x000331025D171301ull, + .num_endpoints = 1, + .endpoints = &single_endpoint, + .name_prefix = "rt713-dmic" + } +}; + static const struct snd_soc_acpi_adr_device mx8373_0_adr[] = { { .adr = 0x000023019F837300ull, @@ -161,6 +179,24 @@ static const struct snd_soc_acpi_adr_device rt1316_3_group1_adr[] = { } }; +static const struct snd_soc_acpi_adr_device rt1316_1_group2_adr[] = { + { + .adr = 0x000131025D131601ull, + .num_endpoints = 1, + .endpoints = &spk_l_endpoint, + .name_prefix = "rt1316-1" + } +}; + +static const struct snd_soc_acpi_adr_device rt1316_2_group2_adr[] = { + { + .adr = 0x000230025D131601ull, + .num_endpoints = 1, + .endpoints = &spk_r_endpoint, + .name_prefix = "rt1316-2" + } +}; + static const struct snd_soc_acpi_adr_device rt1318_1_group1_adr[] = { { .adr = 0x000130025D131801ull, @@ -278,6 +314,30 @@ static const struct snd_soc_acpi_link_adr mtl_sdw_rt1318_l12_rt714_l0[] = { {} }; +static const struct snd_soc_acpi_link_adr mtl_rt713_l0_rt1316_l12_rt1713_l3[] = { + { + .mask = BIT(0), + .num_adr = ARRAY_SIZE(rt713_0_single_adr), + .adr_d = rt713_0_single_adr, + }, + { + .mask = BIT(1), + .num_adr = ARRAY_SIZE(rt1316_1_group2_adr), + .adr_d = rt1316_1_group2_adr, + }, + { + .mask = BIT(2), + .num_adr = ARRAY_SIZE(rt1316_2_group2_adr), + .adr_d = rt1316_2_group2_adr, + }, + { + .mask = BIT(3), + .num_adr = ARRAY_SIZE(rt1713_3_single_adr), + .adr_d = rt1713_3_single_adr, + }, + {} +}; + static const struct snd_soc_acpi_adr_device mx8363_2_adr[] = { { .adr = 0x000230019F836300ull, @@ -338,6 +398,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = { .drv_name = "sof_sdw", .sof_tplg_filename = "sof-mtl-rt715-rt711-rt1308-mono.tplg", }, + { + .link_mask = GENMASK(3, 0), + .links = mtl_rt713_l0_rt1316_l12_rt1713_l3, + .drv_name = "sof_sdw", + .sof_tplg_filename = "sof-mtl-rt713-l0-rt1316-l12-rt1713-l3.tplg", + }, { .link_mask = BIT(3) | BIT(0), .links = mtl_712_only, From patchwork Thu Nov 30 10:20:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1870040 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Sgsg15N69z1ySd for ; Thu, 30 Nov 2023 21:21:33 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1r8eAb-0003ta-1Y; Thu, 30 Nov 2023 10:21:21 +0000 Received: from mail-pg1-f178.google.com ([209.85.215.178]) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1r8eAT-0003rY-8Q for kernel-team@lists.ubuntu.com; Thu, 30 Nov 2023 10:21:13 +0000 Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-5c628bf8d2eso246183a12.1 for ; Thu, 30 Nov 2023 02:21:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701339670; x=1701944470; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=201g04hVw9kv4+Ltee8ifUYmPUYd+BSiSNb9PDvLxqc=; b=RyZi0iIcHUj30KYsNSzdY1jMYQ6HT6aByJQwLkjqX7iJqSdQPXzF3oJfQ58c/KxcTZ A8vNFthQNUd19yE5s4xf6HnmMBgysAjlhHA1A6fRRxvSgi6AnuIWjhfg9/sWGvxexJHh c78rm1vhFo9OF3X7QKZdbX0D9idUbI5T+58DHg7ENxREWcybiV5KTz5UmT3381I4Ge+h Zml/e3vbWIXXlNgPOVWpV76FbhlqLXXm+DCGH0QXNW15g5/1DpyAxhfYvXX88JH+qUH1 gO3LkQ5s1DRBs0I6ZXBhbsszdbD1ceLRdOMpN09B8mnrsdjV/YsYhGMERDyU/+OSetRE NTRQ== X-Gm-Message-State: AOJu0Yx6wwbKo//YgoAlfZR+dVPzw3IOaWDXOOovlc5fXjMLNKsf53os v3rjlR5J6aw9UKHP1Q+2klrOM/YYm6duhQ== X-Google-Smtp-Source: AGHT+IGECwHOx4Hlp4vdQai9B+W/wDIMHl7oo9e8APId+dcgq5Ag/CYzkCW8mZnvKsMM/PRnca6R4w== X-Received: by 2002:a17:90a:d482:b0:280:4af4:1a41 with SMTP id s2-20020a17090ad48200b002804af41a41mr36254939pju.15.1701339670473; Thu, 30 Nov 2023 02:21:10 -0800 (PST) Received: from localhost.localdomain (125-229-129-140.hinet-ip.hinet.net. [125.229.129.140]) by smtp.gmail.com with ESMTPSA id ij24-20020a170902ab5800b001cfcf0fcc4esm983476plb.304.2023.11.30.02.21.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 02:21:09 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/4][SRU][Mantic] ASoC: Intel: sof_sdw_rt_sdca_jack_common: add rt713 support Date: Thu, 30 Nov 2023 18:20:28 +0800 Message-Id: <20231130102030.2407035-3-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231130102030.2407035-1-vicamo.yang@canonical.com> References: <20231130102030.2407035-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.215.178; envelope-from=vicamo@gmail.com; helo=mail-pg1-f178.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Bard Liao BugLink: https://bugs.launchpad.net/bugs/2042090 Adding rt713 support to sof_sdw_rt_sdca_jack_common.c. Fixes: fbaaf80d8cf6 ("ASoC: Intel: sof_sdw: add rt713 support") Signed-off-by: Bard Liao Signed-off-by: Pierre-Louis Bossart Link: https://lore.kernel.org/r/20231012190826.142619-5-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown (cherry picked from commit b6d6e5abf64562985fdbbdbdfe8088cde634d834) Signed-off-by: You-Sheng Yang --- sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c b/sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c index 623e3bebb8884..4360b9f5ff2c7 100644 --- a/sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c +++ b/sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c @@ -58,6 +58,11 @@ static const struct snd_soc_dapm_route rt712_sdca_map[] = { { "rt712 MIC2", NULL, "Headset Mic" }, }; +static const struct snd_soc_dapm_route rt713_sdca_map[] = { + { "Headphone", NULL, "rt713 HP" }, + { "rt713 MIC2", NULL, "Headset Mic" }, +}; + static const struct snd_kcontrol_new rt_sdca_jack_controls[] = { SOC_DAPM_PIN_SWITCH("Headphone"), SOC_DAPM_PIN_SWITCH("Headset Mic"), @@ -109,6 +114,9 @@ static int rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd) } else if (strstr(component->name_prefix, "rt712")) { ret = snd_soc_dapm_add_routes(&card->dapm, rt712_sdca_map, ARRAY_SIZE(rt712_sdca_map)); + } else if (strstr(component->name_prefix, "rt713")) { + ret = snd_soc_dapm_add_routes(&card->dapm, rt713_sdca_map, + ARRAY_SIZE(rt713_sdca_map)); } else { dev_err(card->dev, "%s is not supported\n", component->name_prefix); return -EINVAL; From patchwork Thu Nov 30 10:20:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1870041 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Sgsg759PLz1ySd for ; Thu, 30 Nov 2023 21:21:39 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1r8eAk-0003wd-6k; Thu, 30 Nov 2023 10:21:30 +0000 Received: from mail-pl1-f182.google.com ([209.85.214.182]) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1r8eAU-0003rb-BH for kernel-team@lists.ubuntu.com; Thu, 30 Nov 2023 10:21:14 +0000 Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1cc9b626a96so7474305ad.2 for ; Thu, 30 Nov 2023 02:21:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701339672; x=1701944472; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nAGA2L6IfIPXeFnHS+y0qmIHgK3Vg8sihjgdy9l1+mE=; b=ct+Z3yuKSFaPLKYcQKgiu5UDeMPBH2lmaKPhWvCodclaJqBfM0J39v73GA1nA6smZ/ N2seuaiTTtlsN7QZFQuL4PCmmehjex+YF/zsRPUKfmneIlpO0PjTMj5VMcFK3OqHHshC OReawSYJ+S/5zwz2An/g1c3cu9592e+enOqU08oDbC4DswQ5TJdYeXajbDJGkE7SLHq1 sRZmdMpblFx3El2novQ8lkmeTKTAhfe+fpoxKHDT4xtN7+pX00ButQCfw+B4E+yqKQja TDAUo2Yl2qzNwJ4ban6l01CBR44CYa/O3icEOstqztchUcrA/8iszDnvCwbJ9q9JMfv/ SDyQ== X-Gm-Message-State: AOJu0YzvUJ0wJRxd7CAmoiQE2aVCUtDANbUX5O/SQ9Pv0Qa4IHsBxuc7 B6wI6W4gIP7rRYu1CYaaun/RLUv1m1fiRg== X-Google-Smtp-Source: AGHT+IGX4AV9KwWf8I7uJT5jeS8ECtxxGBI5Ac+aVdi2mXQ6Vq0hLHzNNDkNGcWw8aA7cTT+Q8c4+g== X-Received: by 2002:a17:902:cec1:b0:1ce:5f09:ffdf with SMTP id d1-20020a170902cec100b001ce5f09ffdfmr24904160plg.0.1701339672170; Thu, 30 Nov 2023 02:21:12 -0800 (PST) Received: from localhost.localdomain (125-229-129-140.hinet-ip.hinet.net. [125.229.129.140]) by smtp.gmail.com with ESMTPSA id ij24-20020a170902ab5800b001cfcf0fcc4esm983476plb.304.2023.11.30.02.21.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 02:21:11 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/4][SRU][Mantic] ASoC: Intel: sof_sdw_rt712_sdca: construct cards->components by name_prefix Date: Thu, 30 Nov 2023 18:20:29 +0800 Message-Id: <20231130102030.2407035-4-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231130102030.2407035-1-vicamo.yang@canonical.com> References: <20231130102030.2407035-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.214.182; envelope-from=vicamo@gmail.com; helo=mail-pl1-f182.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Bard Liao BugLink: https://bugs.launchpad.net/bugs/2042090 sof_sdw_rt712_sdca is used by rt712 and rt713. Using different cards->components string allow UCM distinguish the two codecs. Reviewed-by: Rander Wang Signed-off-by: Bard Liao Signed-off-by: Pierre-Louis Bossart Link: https://lore.kernel.org/r/20231012190826.142619-7-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown (backported from commit 5124d08d0ea49c7f4dda989827d0959e58a22150) [vicamo: fix use of snd_soc_rtd_to_codec] Signed-off-by: You-Sheng Yang --- sound/soc/intel/boards/sof_sdw_rt712_sdca.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/boards/sof_sdw_rt712_sdca.c b/sound/soc/intel/boards/sof_sdw_rt712_sdca.c index 84c8025d24e3f..298df62e6aad5 100644 --- a/sound/soc/intel/boards/sof_sdw_rt712_sdca.c +++ b/sound/soc/intel/boards/sof_sdw_rt712_sdca.c @@ -80,10 +80,12 @@ int sof_sdw_rt712_spk_init(struct snd_soc_card *card, static int rt712_sdca_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; + struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_component *component = codec_dai->component; card->components = devm_kasprintf(card->dev, GFP_KERNEL, - "%s mic:rt712-sdca-dmic", - card->components); + "%s mic:%s", + card->components, component->name_prefix); if (!card->components) return -ENOMEM; From patchwork Thu Nov 30 10:20:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1870042 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SgsgP3rPcz1ySd for ; Thu, 30 Nov 2023 21:21:53 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1r8eAr-00041H-HV; Thu, 30 Nov 2023 10:21:37 +0000 Received: from mail-pj1-f53.google.com ([209.85.216.53]) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1r8eAV-0003s7-Uc for kernel-team@lists.ubuntu.com; Thu, 30 Nov 2023 10:21:17 +0000 Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-286447abfbeso131491a91.1 for ; Thu, 30 Nov 2023 02:21:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701339673; x=1701944473; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MQfNGaY0Gpxq2D3KHTZRlsJDk6r4btaXJ7OrGrXwi44=; b=kb0ArwENg4wwMMJev3R5oa29pTjjhUuH04HOOPzHhDdO/1FG2v6pXjLKRrU2Wav3Iv nsTtn5g4SN6TLXZZiFgjSenx7u8wYwjpPkf8Hh4gSBLlI2QFTZCQ0L9zKORtT8oqtjfJ qEzPfwZI7tz/v2OC/zVsLWzXbrrJCkJ4UCm7VBRp1c3+Sz/sEJhe5szwvYKMRwhC1noy hSkC2AqesekNrlMhBRy4Fu8iX8Iwk367dpIvBQcndCtIk1FGFQXNBALaeXO4ZDXFDwev LvBbu4c1S2nxMcMQ8KOCAvEft9WcVW6uPkzBMLfFGmToYknG8O5wbcnc9RsYMBOlR38F qtTw== X-Gm-Message-State: AOJu0YyP1/BsmYkwBBJSPYeJ4O09h+R2f6dtFp0cKEbWWgl6QTm6PsMe rPlR9YVA5jaRMT4EQ4pKDI9tkejEZGqnAA== X-Google-Smtp-Source: AGHT+IHm/eAmQTeQr8Tt/NinyO21HFCSAV69OQZppxYMju2tRoRGb0Qt92U/opZ1WYCToUhaqtieaw== X-Received: by 2002:a17:90a:a504:b0:285:569b:a0a5 with SMTP id a4-20020a17090aa50400b00285569ba0a5mr31832889pjq.11.1701339673488; Thu, 30 Nov 2023 02:21:13 -0800 (PST) Received: from localhost.localdomain (125-229-129-140.hinet-ip.hinet.net. [125.229.129.140]) by smtp.gmail.com with ESMTPSA id ij24-20020a170902ab5800b001cfcf0fcc4esm983476plb.304.2023.11.30.02.21.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 02:21:13 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/4][SRU][Mantic] ASoC: Intel: soc-acpi: rt713+rt1316, no sdw-dmic config Date: Thu, 30 Nov 2023 18:20:30 +0800 Message-Id: <20231130102030.2407035-5-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231130102030.2407035-1-vicamo.yang@canonical.com> References: <20231130102030.2407035-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.216.53; envelope-from=vicamo@gmail.com; helo=mail-pj1-f53.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Mac Chiang BugLink: https://bugs.launchpad.net/bugs/2042090 This is additional HW board: rt713+rt1316 without rt713-dmic configuration: SDW0: rt713 audio jack SDW1: rt1316 spk_amp_l SDW2: rt1316 spk_amp_r Signed-off-by: Mac Chiang Reviewed-by: Bard Liao Reviewed-by: Pierre-Louis Bossart Signed-off-by: Peter Ujfalusi Link: https://lore.kernel.org/r/20231127133448.18449-5-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown (cherry picked from commit 817178e7674bd8ca35344b2212a3105ed75559e5 linux-next) Signed-off-by: You-Sheng Yang --- .../intel/common/soc-acpi-intel-mtl-match.c | 25 +++++++++++++++++++ 1 file changed, 25 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 2e210c24edb28..c846bd4d1282a 100644 --- a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c @@ -338,6 +338,25 @@ static const struct snd_soc_acpi_link_adr mtl_rt713_l0_rt1316_l12_rt1713_l3[] = {} }; +static const struct snd_soc_acpi_link_adr mtl_rt713_l0_rt1316_l12[] = { + { + .mask = BIT(0), + .num_adr = ARRAY_SIZE(rt713_0_single_adr), + .adr_d = rt713_0_single_adr, + }, + { + .mask = BIT(1), + .num_adr = ARRAY_SIZE(rt1316_1_group2_adr), + .adr_d = rt1316_1_group2_adr, + }, + { + .mask = BIT(2), + .num_adr = ARRAY_SIZE(rt1316_2_group2_adr), + .adr_d = rt1316_2_group2_adr, + }, + {} +}; + static const struct snd_soc_acpi_adr_device mx8363_2_adr[] = { { .adr = 0x000230019F836300ull, @@ -404,6 +423,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = { .drv_name = "sof_sdw", .sof_tplg_filename = "sof-mtl-rt713-l0-rt1316-l12-rt1713-l3.tplg", }, + { + .link_mask = GENMASK(2, 0), + .links = mtl_rt713_l0_rt1316_l12, + .drv_name = "sof_sdw", + .sof_tplg_filename = "sof-mtl-rt713-l0-rt1316-l12.tplg", + }, { .link_mask = BIT(3) | BIT(0), .links = mtl_712_only,