From patchwork Tue Nov 21 11:56:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Chiu X-Patchwork-Id: 1866664 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 4SZNBk6BfPz1yRq for ; Tue, 21 Nov 2023 22:56:30 +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 1r5PMe-0000OW-Hl; Tue, 21 Nov 2023 11:56:24 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1r5PMY-0000Nb-12 for kernel-team@lists.ubuntu.com; Tue, 21 Nov 2023 11:56:19 +0000 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 918503F129 for ; Tue, 21 Nov 2023 11:56:17 +0000 (UTC) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-1cc1ddb34ccso63037905ad.1 for ; Tue, 21 Nov 2023 03:56:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700567776; x=1701172576; 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=9WbKoWm7Ku6ndCAOLYOG2yJEBAB1yJPPGGCNLSHFT9o=; b=DCSxBr9JqFJjxHo5kwj1OGHd5PfW3posGBj27DnIgrQCWleDOD2kDhm1mJjS2JgcMK UmblSF/OjKKZGPxWEDwHcpERTog35lfhcBjcdSJpTdTneV94gtbtd59sp7lTzlzA64hm RkIVH2b+85t3kUkq1hkzdeK+T0MsL6+bFQ+61BOOP3NA8cglOqP370dSaDohwbOw2Rmz s0MRZJ5RDVuWnB07l71cR1cONkdU24S75mu7l0uXDhgY5gXvXD2paz+cbx+MWJUGSdv+ vUVfARatEBiZ4cTgDFd5ZljPzfp1o+MJhoaK3/7KUaAfxrHF6dtt92Yc2jFYLZWol7Xu 2vxA== X-Gm-Message-State: AOJu0Yz2XPqg0VkJdkorrCkxEoIOGCbKWKFaHgEGwEeD4s4/cYCcjXvc 4/cyxkzuzujo6C1T35gSguMb7S+4OZseRbuJyNJSRIgjOR4E+/1hjHLZSeigitUJOtxqGQN8yaD g0jhM9e+7gDWZ+dqFfSVrlotiirQRX/bcEwxbWqnJyvDhI/khrQ== X-Received: by 2002:a17:902:e84b:b0:1cf:56bf:8dd5 with SMTP id t11-20020a170902e84b00b001cf56bf8dd5mr8565905plg.51.1700567775689; Tue, 21 Nov 2023 03:56:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IEDzJyY8uOOAK/pskScqDHREx9kMM77th5mpCc40GLsVx5hkP7ki/QXmm/ZBXWI9WUXvFsgOw== X-Received: by 2002:a17:902:e84b:b0:1cf:56bf:8dd5 with SMTP id t11-20020a170902e84b00b001cf56bf8dd5mr8565885plg.51.1700567775249; Tue, 21 Nov 2023 03:56:15 -0800 (PST) Received: from localhost.localdomain (114-36-219-155.dynamic-ip.hinet.net. [114.36.219.155]) by smtp.gmail.com with ESMTPSA id y7-20020a17090322c700b001c9c5a1b477sm2954941plg.169.2023.11.21.03.56.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 03:56:14 -0800 (PST) From: Chris Chiu To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1][SRU][M] ASoC: Intel: soc-acpi-intel-rpl-match: add rt711-l0-rt1316-l12 support Date: Tue, 21 Nov 2023 19:56:09 +0800 Message-Id: <20231121115609.10299-2-chris.chiu@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231121115609.10299-1-chris.chiu@canonical.com> References: <20231121115609.10299-1-chris.chiu@canonical.com> MIME-Version: 1.0 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/2038263 Another configuration that doesn't support DMIC. Signed-off-by: Bard Liao Signed-off-by: Pierre-Louis Bossart Link: https://lore.kernel.org/r/20231012190826.142619-3-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown (cherry picked from commit 43e354dada62c0425db900f327a6e11babefcf5c) Signed-off-by: Chris Chiu --- .../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 302a08018572..1e586d97116a 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_link2_rt1316_link01[] = {} }; +static const struct snd_soc_acpi_link_adr rpl_sdw_rt711_link0_rt1316_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(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, + }, + {} +}; + static const struct snd_soc_acpi_link_adr rpl_sdw_rt711_link0_rt1318_link12_rt714_link3[] = { { .mask = BIT(0), @@ -389,6 +408,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 rt1316s on link1 and link2 */ + .links = rpl_sdw_rt711_link0_rt1316_link12, + .drv_name = "sof_sdw", + .sof_tplg_filename = "sof-rpl-rt711-l0-rt1316-l12.tplg", + }, { .link_mask = 0x7, /* rt711 on link0 & two rt1318s on link1 and link2 */ .links = rpl_sdw_rt711_link0_rt1318_link12,