From nobody Mon Jun 8 20:54:07 2026 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DE34F30F7FA for ; Tue, 26 May 2026 15:30:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779809410; cv=none; b=jCDDwe9xNTtRBv34jUxN6gq7hwZtJJoshoWc8tdURnBfN3jQmixXXG65GJhn1gcqZqsfPPCyyCtAJ2kdlgMOVqcSTVfnz69Vy/LWETRYKyJKJAgzGRsvTMLxws4LTo7SMZbcRkMC9yHgopgQSwRNolw2TPANzXzfnlsjeWDWPTE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779809410; c=relaxed/simple; bh=d5No5p2kPGYPEeCcwPbvtzn0vYshvW4XXLjtHG58mNs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HmHjDuGar638q44tkB5dZJRYWK8wR1cMtrBmF04lToHTJnb2Db53w+bCCZw9MjZwsgZHScPfRK2f+rT/BlNpm1oX9KHdXymGiWCsvtDGHSHkdMv3VyRearPiO1LGwh1dj530XC9NyEAj2tMuMzQiSSyCxNBsYOfGnY0Epkb8OJI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=fairphone.com; spf=pass smtp.mailfrom=fairphone.com; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b=zC21jxOL; arc=none smtp.client-ip=209.85.221.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=fairphone.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fairphone.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b="zC21jxOL" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-45e7c636e74so5709640f8f.0 for ; Tue, 26 May 2026 08:30:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1779809402; x=1780414202; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=9Izp9MZRfDJ61whqJr+eGkWfgZt9VEoIk4csFEn366E=; b=zC21jxOLAGFNXO/HHhONuDs2YGouoRLpPQP9jYirJdq4MDkDmVgbc2+3tD+xQLnHc0 0UCFzqLNQ66w2/UU+0SsE1osKpNh0dxfwmeZIddv+G+ZD8ef2QSW2USsVnyuKgckEh6r zkhEZFDO6ee+0N4o/Na0v0pLiyECKDcExkZHXIfxJw65rTGe7uF4mM6OHL6mdq8aB0v2 5g/KENckNW46rOGAq4oprX6Ta+F21F2Sz+t+yrDb4jegTXS8XRO6DgFBDLHjhumKMcaP /v7qnFgQ+IXHnDe5AcaVQp8rZQSZswrg5uyGywKlJTZ/AtRKysdcXWl/BbLr/aVHRzb9 xgsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779809402; x=1780414202; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=9Izp9MZRfDJ61whqJr+eGkWfgZt9VEoIk4csFEn366E=; b=hDnhxl2MXA0UJqcrJSQX9SPwi1ZqYZJ42Cg/V/d8/9QpLD2zdVdfWwooPqBhA3bFGV L2GIfQOPNWXDKBVut2goBg1gYPCfIOSpB/vBAxMU1Z8PpY5YLWvuQOZHMLAmcJSwueXI HaryzS8lbxAhGnIAGIyfrNd6impAgFKrUK0ZEU2IfCesiOsPCq/z+17Vck48gxMRFZ/5 mzY9oKfyr+LUuo1NzZGQE/KQLi4H3555fKQw0H6InXHZxV6Tav58fzcE1dlUpHoKamAW O+cpItMFSAswviqj1F/rcyywDnheiLOK5NltzKMhtuoaOio1/EzreR4QZN2Vzh0aAm/2 10sA== X-Forwarded-Encrypted: i=1; AFNElJ8SbjB+94uA+Q6B19A8lGJ58Mb8OxmUAD5Eao5Z3OAWmxSvehZ+zJLcPBm8XexCzqAvFRJ3t5XiF37ZB/g=@vger.kernel.org X-Gm-Message-State: AOJu0Yx/KEaChuTO1qUMdyPpDArXGrMO58NlKW8584FnEwNm9cAVRSy7 zDLWbCT42Wmz9Oxdi/V3i2PGi2XTaYeeIbY+V7S/Dr2t/Rm2h1R0Xd5uD2FjWpd195E= X-Gm-Gg: Acq92OEkqMW4vCTrKItd2Z0oM7HS1h+0PGd/GS5jUUt0CqgxUGlEvVtR2UF/6MK0QWH vGGvdtusl3Q6a28HlQj05TxWstB6VUYO9LKp83GfAbLID2uXox7doI97ycJGvRS0t6tMOw9C5mP gund2axx35renzJEakO1jpjdd+jvLiKHNzgwvdEGpkwHjSQrEPR5hocP8MGPfeYpTejYmAiKvLm 24D7axscc5QyO+KFCYs4T2NlvtcoEXVWYAHaRX/Dgpfk/lDZ6/kMJ8n5enVNipcRwK4+/WldAzw e+aqrAIh//T2jcbVlcN3YX588JKQnQbR8y6NfUkQ0K67FS+E5C51SsNKyOE2SAd4yBRg5HDfIfi OQmqVqpRlf8iVsZae5YfoxrHcDoaoXzZSu3VPECtQAeyr+7/0WDSU3r4VyETKfxK4Cs2H6LL/C+ CopCalnJPfbS+SxlQk88HfjwGyRvPjFz+3 X-Received: by 2002:a05:6000:25fd:b0:43c:fa96:d939 with SMTP id ffacd0b85a97d-45eb38a66f0mr30090550f8f.22.1779809402180; Tue, 26 May 2026 08:30:02 -0700 (PDT) Received: from [10.107.1.102] ([212.133.41.39]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d5caeesm37691140f8f.29.2026.05.26.08.30.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 08:30:01 -0700 (PDT) From: Luca Weiss Date: Tue, 26 May 2026 17:29:54 +0200 Subject: [PATCH RFC 1/2] ASoC: codecs: lpass-tx-macro: Use correct config for sc7280 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260526-sc7280-tx-macro-v1-1-1aad6900fec0@fairphone.com> References: <20260526-sc7280-tx-macro-v1-0-1aad6900fec0@fairphone.com> In-Reply-To: <20260526-sc7280-tx-macro-v1-0-1aad6900fec0@fairphone.com> To: Srinivas Kandagatla , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , cros-qcom-dts-watchers@chromium.org Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, linux-sound@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Luca Weiss X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1779809398; l=1167; i=luca.weiss@fairphone.com; s=20250611; h=from:subject:message-id; bh=d5No5p2kPGYPEeCcwPbvtzn0vYshvW4XXLjtHG58mNs=; b=uAdZLNZsfUX4RLp9inUuLMDBsGewFvqrwfJwhlCgMSPgkhFLi8YtiiUMO4qU+M5ZSEnUl9sda vCC7PvpT73ODFseHSnV08jqTGnUAaQpiKw5RTnjNyzscsY3xst+kPOQ X-Developer-Key: i=luca.weiss@fairphone.com; a=ed25519; pk=O1aw+AAust5lEmgrNJ1Bs7PTY0fEsJm+mdkjExA69q8= With the v9 data, the controls will have completely wrong names and using wrong code paths that do not apply to v9.4. Note, that this will change control names so it's a breaking change. Signed-off-by: Luca Weiss --- sound/soc/codecs/lpass-tx-macro.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-= macro.c index f7d168f557dd..7f93ab0c3872 100644 --- a/sound/soc/codecs/lpass-tx-macro.c +++ b/sound/soc/codecs/lpass-tx-macro.c @@ -2493,14 +2493,9 @@ static const struct tx_macro_data lpass_ver_11 =3D { =20 static const struct of_device_id tx_macro_dt_match[] =3D { { - /* - * The block is actually LPASS v9.4, but keep LPASS v9 match - * data and audio widgets, due to compatibility reasons. - * Microphones are working on SC7280 fine, so apparently the fix - * is not necessary. - */ .compatible =3D "qcom,sc7280-lpass-tx-macro", - .data =3D &lpass_ver_9, + /* LPASS v9.4 */ + .data =3D &lpass_ver_9_2, }, { .compatible =3D "qcom,sm6115-lpass-tx-macro", .data =3D &lpass_ver_10_sm6115, --=20 2.54.0 From nobody Mon Jun 8 20:54:07 2026 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C94AB325494 for ; Tue, 26 May 2026 15:30:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779809411; cv=none; b=bYnWKR4Tj3o8zezVcsIVpvOX88WDc8d0WNBga0E+OkFn+IczxUNp4irlfWAvPhz5I04r8Lh8NB2NFSaiAdMuVFYIOz4KJoaA8xsmW+LoEs/SaNB3T378WbX4siGZRfqM7uz2S1C9m7ofU8FWqnJZ2TEW/6UygmsXtEYLqjurbJE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779809411; c=relaxed/simple; bh=iGTwHgBHeLX3ILgd04nNErc/W++Eogoek/IlmiG7e0g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=N1JvXTw5ghynNRbn7znP+H4sPwqmHjV36jRJFeaQ4GKhFh8Wz/doGQO27m2vR6kluurN40Qj3NBjf5gmS3RiGdjCdPeP4b5afxy+e9YJUFYBzbyqnVba+99Aw/VJhIqOeb6TeCGrxzSyGs6jWzoT0YIupSoMJ+M2W4JS8rbom0I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=fairphone.com; spf=pass smtp.mailfrom=fairphone.com; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b=hBPwvYY2; arc=none smtp.client-ip=209.85.221.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=fairphone.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fairphone.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b="hBPwvYY2" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-44dd5cb0f81so7702099f8f.0 for ; Tue, 26 May 2026 08:30:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1779809405; x=1780414205; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=vhkmSXGNrf6eecWgP6NaxELfI3WHj96xq4ue7rXgP0U=; b=hBPwvYY21w+3Kqj6/ns1M1Bz8PM2RUgx7L7AYPv27bqP5n1nxUYeYDr/GMP0QRLbAf /oB1excYIvSTwEFzycoE7gZ+uLZGSXkkxOhGEWlr1sj4evau5S/eoRUD15kXeLsmIAVQ /zThqbCBEgDtQOOFf+0AgUdzbNQ32pqguAi9De/6KVbLz/smPVETiEc7DbZznDd00EJX VPxfgWpQcrYI5ge9K5t+GMt/vKxS9x1UcJk4kvJYgQ9PanShUFU5df5yH6XHRRj6/U/g qjYJstEgM/HgP8W2BsiQrssQM7ptx9sdbLoeNbr8gFV5tMLf35TlMgkSwFl0ZwmFqjeE JbIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779809405; x=1780414205; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=vhkmSXGNrf6eecWgP6NaxELfI3WHj96xq4ue7rXgP0U=; b=kTUPwqpxK9vmcFgfuLrw2bt1jCWQeBk5NnQecz33SU2psug0qFChJQqgunpph+FRGh WSINYoFmbbYZgsQEwS2T5NXbWxDKsfOFbrhY6ENFQDG9wKp0UwgQ/ahZ3Wdk80RAfy7H LonQ9rm/PBHBym9Yf29PueXNw+hV5DzV0qiYhuOfVsWRU3rD8r8K6sNV+m0kfYlbrdAE jUZU3r6I/G1SO+eADhpGkS6KKkiuLnw1X0IDhPNxZhPoxe8GfbziWRoZy1eU1jMidf+R KkYMVnL9H4UfjCdYSxy5zgs0RTNKlhXn2hpqnvgPiOqdtjEL91C5RB6xKy9bbiAZDQS7 os+Q== X-Forwarded-Encrypted: i=1; AFNElJ9eLsSRUQYm1WEbNGYDaxL+AnvLQuKv8ob6eCup4Rwbq/I3ez0nmXI5uVMZuigqPjpQg+Ei5PLhxLfK7oY=@vger.kernel.org X-Gm-Message-State: AOJu0Yw0U4dxTxCSnIvkfQlIJpVMfNLFRfssvP4DcrZqAoGyrsZp2RXx CZSXUoNz6744BDqeMxijmeXiH60i3kGJckmSsFxzPhP/9PEeS0+3uXiI08wDglFZXqw= X-Gm-Gg: Acq92OGpCisE8Cguo0eJwh0/1qBMD2GHO5T2BGvxLNax8nhDntldWZSNPvJyZFeTJ7Z 6IF6xmEwoyXo8wqDiSFARSu9IE7MUvCzRLLTwVHVJk/CAN10IDliu3wEmRbXXVb626GptSc3HBk Xdot7v0nukX1qndSvhopiB0VT5lTuqS+HtqNYbcO7oTccUSxBs+VVXTocnQrlnPfp9r8J63BYfw WifTHt9PKkigq6cTCt5s/RmT3GlR+HwCznzSlHEler1+9V99TLKFBCa+qYEr2Q305AzG2bNPBCF uB+8XSdQlMmAstwLflCJZlN+kj/yUqOvDcAvryF/Bhdd7XEvUn/UxcN7VWizaqlSMjeLd0u1how 7NAVwKdAp9CrRtig7kuVic2r/EmpvC5PY7bh3VPbx+AnPvY0drLlnyp5LVN/R+YvKIt4lMTJjq2 jVlzxhHKCTVf38y0MFekiln209HxyR/7oK X-Received: by 2002:a05:6000:25c8:b0:45e:b9b4:c68d with SMTP id ffacd0b85a97d-45eb9b4c854mr27242005f8f.4.1779809404418; Tue, 26 May 2026 08:30:04 -0700 (PDT) Received: from [10.107.1.102] ([212.133.41.39]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d5caeesm37691140f8f.29.2026.05.26.08.30.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 08:30:04 -0700 (PDT) From: Luca Weiss Date: Tue, 26 May 2026 17:29:55 +0200 Subject: [PATCH RFC 2/2] arm64: dts: qcom: kodiak: Fix up LPASS TX macro v9.4 control names Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260526-sc7280-tx-macro-v1-2-1aad6900fec0@fairphone.com> References: <20260526-sc7280-tx-macro-v1-0-1aad6900fec0@fairphone.com> In-Reply-To: <20260526-sc7280-tx-macro-v1-0-1aad6900fec0@fairphone.com> To: Srinivas Kandagatla , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , cros-qcom-dts-watchers@chromium.org Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, linux-sound@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Luca Weiss X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1779809398; l=6900; i=luca.weiss@fairphone.com; s=20250611; h=from:subject:message-id; bh=iGTwHgBHeLX3ILgd04nNErc/W++Eogoek/IlmiG7e0g=; b=opyYbtZw6SUYmPrNcW3j6K1y7j4lAENYIJUfh4vzihODYxclG05oeO/6oBQLoTDqVlE9HaKJ9 IcoBrff4BUpBMVnr8RGjImnxyVwIin1ve76FvwVv21237CSdGbl8J7L X-Developer-Key: i=luca.weiss@fairphone.com; a=ed25519; pk=O1aw+AAust5lEmgrNJ1Bs7PTY0fEsJm+mdkjExA69q8= After fixing to the lpass-tx-macro driver to use the correct v9.4 configuration, some control names have changed and therefore need to be updated. * "TX SWR_ADC" 0-3 becomes "TX SWR_INPUT" 0-3 * "TX SWR_DMIC" 0-7 becomes "TX SWR_INPUT" 4-11 Update all usages in dts. Signed-off-by: Luca Weiss --- arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 2 +- .../boot/dts/qcom/qcs6490-radxa-dragon-q6a.dts | 2 +- arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts | 22 +++++++++++-------= ---- .../dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi | 22 +++++++++++-------= ---- .../dts/qcom/sc7280-herobrine-villager-r1.dtsi | 22 +++++++++++-------= ---- arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 22 +++++++++++-------= ---- 6 files changed, 46 insertions(+), 46 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts b/arch/arm64/boot/dts= /qcom/qcm6490-idp.dts index bdc02260f902..565f7db91e77 100644 --- a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts +++ b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts @@ -860,7 +860,7 @@ &sound { "TX DMIC0", "MIC BIAS1", "TX DMIC1", "MIC BIAS2", "TX DMIC2", "MIC BIAS3", - "TX SWR_ADC1", "ADC2_OUTPUT", + "TX SWR_INPUT1", "ADC2_OUTPUT", "VA DMIC0", "VA MIC BIAS3", "VA DMIC1", "VA MIC BIAS3", "VA DMIC2", "VA MIC BIAS1", diff --git a/arch/arm64/boot/dts/qcom/qcs6490-radxa-dragon-q6a.dts b/arch/a= rm64/boot/dts/qcom/qcs6490-radxa-dragon-q6a.dts index bb5a42b038f1..a36bd6120ea2 100644 --- a/arch/arm64/boot/dts/qcom/qcs6490-radxa-dragon-q6a.dts +++ b/arch/arm64/boot/dts/qcom/qcs6490-radxa-dragon-q6a.dts @@ -736,7 +736,7 @@ &sound { audio-routing =3D "IN1_HPHL", "HPHL_OUT", "IN2_HPHR", "HPHR_OUT", "AMIC2", "MIC BIAS2", - "TX SWR_ADC1", "ADC2_OUTPUT"; + "TX SWR_INPUT1", "ADC2_OUTPUT"; =20 wcd-playback-dai-link { link-name =3D "WCD Playback"; diff --git a/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts b/arch/arm64/boot/d= ts/qcom/sc7280-crd-r3.dts index c2cba9d7179b..ffe028bd0c72 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts @@ -101,17 +101,17 @@ &sound { "VA DMIC1", "MIC BIAS1", "VA DMIC2", "MIC BIAS3", "VA DMIC3", "MIC BIAS3", - "TX SWR_ADC0", "ADC1_OUTPUT", - "TX SWR_ADC1", "ADC2_OUTPUT", - "TX SWR_ADC2", "ADC3_OUTPUT", - "TX SWR_DMIC0", "DMIC1_OUTPUT", - "TX SWR_DMIC1", "DMIC2_OUTPUT", - "TX SWR_DMIC2", "DMIC3_OUTPUT", - "TX SWR_DMIC3", "DMIC4_OUTPUT", - "TX SWR_DMIC4", "DMIC5_OUTPUT", - "TX SWR_DMIC5", "DMIC6_OUTPUT", - "TX SWR_DMIC6", "DMIC7_OUTPUT", - "TX SWR_DMIC7", "DMIC8_OUTPUT"; + "TX SWR_INPUT0", "ADC1_OUTPUT", + "TX SWR_INPUT1", "ADC2_OUTPUT", + "TX SWR_INPUT2", "ADC3_OUTPUT", + "TX SWR_INPUT4", "DMIC1_OUTPUT", + "TX SWR_INPUT5", "DMIC2_OUTPUT", + "TX SWR_INPUT6", "DMIC3_OUTPUT", + "TX SWR_INPUT7", "DMIC4_OUTPUT", + "TX SWR_INPUT8", "DMIC5_OUTPUT", + "TX SWR_INPUT9", "DMIC6_OUTPUT", + "TX SWR_INPUT10", "DMIC7_OUTPUT", + "TX SWR_INPUT11", "DMIC8_OUTPUT"; }; =20 &wcd9385 { diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi b= /arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi index ce48e4cda170..bc492346f7dc 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi @@ -20,17 +20,17 @@ sound: sound { "VA DMIC1", "MIC BIAS1", "VA DMIC2", "MIC BIAS3", "VA DMIC3", "MIC BIAS3", - "TX SWR_ADC0", "ADC1_OUTPUT", - "TX SWR_ADC1", "ADC2_OUTPUT", - "TX SWR_ADC2", "ADC3_OUTPUT", - "TX SWR_DMIC0", "DMIC1_OUTPUT", - "TX SWR_DMIC1", "DMIC2_OUTPUT", - "TX SWR_DMIC2", "DMIC3_OUTPUT", - "TX SWR_DMIC3", "DMIC4_OUTPUT", - "TX SWR_DMIC4", "DMIC5_OUTPUT", - "TX SWR_DMIC5", "DMIC6_OUTPUT", - "TX SWR_DMIC6", "DMIC7_OUTPUT", - "TX SWR_DMIC7", "DMIC8_OUTPUT"; + "TX SWR_INPUT0", "ADC1_OUTPUT", + "TX SWR_INPUT1", "ADC2_OUTPUT", + "TX SWR_INPUT2", "ADC3_OUTPUT", + "TX SWR_INPUT4", "DMIC1_OUTPUT", + "TX SWR_INPUT5", "DMIC2_OUTPUT", + "TX SWR_INPUT6", "DMIC3_OUTPUT", + "TX SWR_INPUT7", "DMIC4_OUTPUT", + "TX SWR_INPUT8", "DMIC5_OUTPUT", + "TX SWR_INPUT9", "DMIC6_OUTPUT", + "TX SWR_INPUT10", "DMIC7_OUTPUT", + "TX SWR_INPUT11", "DMIC8_OUTPUT"; =20 #address-cells =3D <1>; #size-cells =3D <0>; diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dtsi b/a= rch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dtsi index b25df5a99161..c6606b1eb71c 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dtsi @@ -23,15 +23,15 @@ &sound { "VA DMIC1", "vdd-micb", "VA DMIC2", "vdd-micb", "VA DMIC3", "vdd-micb", - "TX SWR_ADC0", "ADC1_OUTPUT", - "TX SWR_ADC1", "ADC2_OUTPUT", - "TX SWR_ADC2", "ADC3_OUTPUT", - "TX SWR_DMIC0", "DMIC1_OUTPUT", - "TX SWR_DMIC1", "DMIC2_OUTPUT", - "TX SWR_DMIC2", "DMIC3_OUTPUT", - "TX SWR_DMIC3", "DMIC4_OUTPUT", - "TX SWR_DMIC4", "DMIC5_OUTPUT", - "TX SWR_DMIC5", "DMIC6_OUTPUT", - "TX SWR_DMIC6", "DMIC7_OUTPUT", - "TX SWR_DMIC7", "DMIC8_OUTPUT"; + "TX SWR_INPUT0", "ADC1_OUTPUT", + "TX SWR_INPUT1", "ADC2_OUTPUT", + "TX SWR_INPUT2", "ADC3_OUTPUT", + "TX SWR_INPUT4", "DMIC1_OUTPUT", + "TX SWR_INPUT5", "DMIC2_OUTPUT", + "TX SWR_INPUT6", "DMIC3_OUTPUT", + "TX SWR_INPUT7", "DMIC4_OUTPUT", + "TX SWR_INPUT8", "DMIC5_OUTPUT", + "TX SWR_INPUT9", "DMIC6_OUTPUT", + "TX SWR_INPUT10", "DMIC7_OUTPUT", + "TX SWR_INPUT11", "DMIC8_OUTPUT"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts= /qcom/sc7280-idp.dtsi index 8cac4ce9c851..e54379147d2b 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi @@ -101,17 +101,17 @@ sound: sound { "VA DMIC1", "MIC BIAS3", "VA DMIC2", "MIC BIAS1", "VA DMIC3", "MIC BIAS1", - "TX SWR_ADC0", "ADC1_OUTPUT", - "TX SWR_ADC1", "ADC2_OUTPUT", - "TX SWR_ADC2", "ADC3_OUTPUT", - "TX SWR_DMIC0", "DMIC1_OUTPUT", - "TX SWR_DMIC1", "DMIC2_OUTPUT", - "TX SWR_DMIC2", "DMIC3_OUTPUT", - "TX SWR_DMIC3", "DMIC4_OUTPUT", - "TX SWR_DMIC4", "DMIC5_OUTPUT", - "TX SWR_DMIC5", "DMIC6_OUTPUT", - "TX SWR_DMIC6", "DMIC7_OUTPUT", - "TX SWR_DMIC7", "DMIC8_OUTPUT"; + "TX SWR_INPUT0", "ADC1_OUTPUT", + "TX SWR_INPUT1", "ADC2_OUTPUT", + "TX SWR_INPUT2", "ADC3_OUTPUT", + "TX SWR_INPUT4", "DMIC1_OUTPUT", + "TX SWR_INPUT5", "DMIC2_OUTPUT", + "TX SWR_INPUT6", "DMIC3_OUTPUT", + "TX SWR_INPUT7", "DMIC4_OUTPUT", + "TX SWR_INPUT8", "DMIC5_OUTPUT", + "TX SWR_INPUT9", "DMIC6_OUTPUT", + "TX SWR_INPUT10", "DMIC7_OUTPUT", + "TX SWR_INPUT11", "DMIC8_OUTPUT"; =20 #address-cells =3D <1>; #size-cells =3D <0>; --=20 2.54.0