From patchwork Wed Jan 11 07:06:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 1724481 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=HJfJ6/WX; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=VE7kCZZ8; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NsJkF5xLCz23fd for ; Wed, 11 Jan 2023 18:11:01 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MSvVrBXoo84Z3BfBJj0FEuLvJJ+L6IS/obfc+uPCT1U=; b=HJfJ6/WXAGXR5f JKU4U3msee8ltBTmZSYmtqDNAdd9+DzbvM1ZcQ2e0e/hIFNS76ivn1NCt9cKBwzwjt2Dm0zll79/y y4G8XIE4jar0w67B+vVTfFqBJH9oJrIc9dQd/uOpsJjkpmVhKWSbrruahUtwKASOXribEKd6UTjW2 EE5cXKgPjcM/DdCRq4LOTmMKnkiiPUbteEjnpev99h1yKJBszabeypaMHf7ZAahRMx+uSmFLJbF/h a1N/lYNnmHpfG/g9gE3+5fIusiHGXNmANv64TFeeQ5nPLKbRAD+7meWQKRHhhyjNwtmqBYJkgwTjN 0syvgAwu0Ss5vHYCXwEw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFVD9-009xeQ-OO; Wed, 11 Jan 2023 07:07:48 +0000 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFVCW-009xW4-MP for openwrt-devel@lists.openwrt.org; Wed, 11 Jan 2023 07:07:10 +0000 Received: by mail-pj1-x102b.google.com with SMTP id fz16-20020a17090b025000b002269d6c2d83so3257770pjb.0 for ; Tue, 10 Jan 2023 23:07:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=odHQGLrxzrYnicPlBBcSbfUQ712M+gj27NsetE6hatE=; b=VE7kCZZ81UpHU8tLn9U84rkTo5tKYlcolhtawymi+G5NBDeszA7cFJFW450JDvaklY 0awHwjgrUCI+oAxKrZNeWAwPAUp023BkJ2mqRc3FrsJf0Ii5hYHdIAX9WL3OOPkQCKZr tBtksiuAmbsbuUNkFCzQUSBi3Z6pvyl4SHhS6A9NTTgHwtUHyJ1PlRC5eJ3JJC8RnjIz xSDXosLP7yv4c4UgoLxjZEI6yU6p3EQXDtKZpBsRPwoFeFjXBcMvz07GlWXqarna0x2e nue5BVwyCf8Hy/8HFI4Q6bFs1mfmS/30MQIc/BBKOEeLY2OPHtvS+qPIMuqHoGwhquYY VKzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=odHQGLrxzrYnicPlBBcSbfUQ712M+gj27NsetE6hatE=; b=cMAFiUT7P/Ch8sZ+xAgc8+ToKKXdgY3IuJzw5kouvLJFmIoremyj3a0Mm3KNKlFNa5 giwsxUNnlMMNCnUwcfVMFj+s9WwG/H2G901AVw7eamIiI1fFv3Ve/ZT/oyD7aCP/edA1 L+7L57aESrAkVd8RUR/8J6fnNQJX9hyF4kkmP/KsQig3NQij5e8kg+ukG5OUkxJSHhvb nQHF2KGrXmEJySgMpJh2sxuD9RMYvNSByrnrBI0UTjqfdqKG+iSZCK6N5NyRo9zvOPrX /l4RK4OKVEM6BuPmwsGo4AYTUHXeiuXTMXLFfPaXFlaNgFSnhkbnVaM769/H0Y7Tb26b fkUg== X-Gm-Message-State: AFqh2krmCYFRW2GSW6xlhAYyQEbFpSGjj1gN1VLxUMrp53kleb34M0Ae 9c9thdv9B11nH38NyFOCTZl79BYJLT4= X-Google-Smtp-Source: AMrXdXteUpRMkCoVXIynZNzUO7XoDAkjEVXih3HRKaOZrBBfPLEHJDzgUcSvge+9Cn2o3PQesHiBXw== X-Received: by 2002:a17:902:b106:b0:193:376f:fb58 with SMTP id q6-20020a170902b10600b00193376ffb58mr6626689plr.37.1673420826750; Tue, 10 Jan 2023 23:07:06 -0800 (PST) Received: from localhost (104-50-1-205.lightspeed.sntcca.sbcglobal.net. [104.50.1.205]) by smtp.gmail.com with ESMTPSA id n13-20020a170903110d00b001925ec4664esm9311151plh.172.2023.01.10.23.07.06 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Jan 2023 23:07:06 -0800 (PST) From: Brian Norris To: openwrt-devel@lists.openwrt.org Cc: Brian Norris Subject: [PATCH v3 4/7] ipq806x: ASoC: qcom: lpass-cpu: Fix fallback SD line index handling Date: Tue, 10 Jan 2023 23:06:49 -0800 Message-Id: <20230111070652.1200657-4-computersforpeace@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230111070652.1200657-1-computersforpeace@gmail.com> References: <20230111070652.1200657-1-computersforpeace@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230110_230708_757205_062959C5 X-CRM114-Status: GOOD ( 17.48 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: This fixes device tree registration for 'qcom,lpass-cpu' as used by qcom-ipq8064 SoCs, and allows speaker audio to function. This patch has been submitted (and merged, for -next; likely v6.3) upstream. Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:102b listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [computersforpeace[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This fixes device tree registration for 'qcom,lpass-cpu' as used by qcom-ipq8064 SoCs, and allows speaker audio to function. This patch has been submitted (and merged, for -next; likely v6.3) upstream. Signed-off-by: Brian Norris --- (no changes since v2) Changes in v2: * Add upstream (-next) notes * Renumber to 0xx-v6.3-*.patch ...cpu-Fix-fallback-SD-line-index-handl.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 target/linux/ipq806x/patches-5.15/007-v6.3-ASoC-qcom-lpass-cpu-Fix-fallback-SD-line-index-handl.patch diff --git a/target/linux/ipq806x/patches-5.15/007-v6.3-ASoC-qcom-lpass-cpu-Fix-fallback-SD-line-index-handl.patch b/target/linux/ipq806x/patches-5.15/007-v6.3-ASoC-qcom-lpass-cpu-Fix-fallback-SD-line-index-handl.patch new file mode 100644 index 000000000000..099dc606114e --- /dev/null +++ b/target/linux/ipq806x/patches-5.15/007-v6.3-ASoC-qcom-lpass-cpu-Fix-fallback-SD-line-index-handl.patch @@ -0,0 +1,42 @@ +From: Brian Norris +Date: Thu, 15 Dec 2022 01:33:45 -0800 +Subject: [PATCH] ASoC: qcom: lpass-cpu: Fix fallback SD line index handling + +[[ Submitted upstream as: + https://lore.kernel.org/all/20221231061545.2110253-1-computersforpeace@gmail.com/ + Currently queued for -next (v6.3?) as: + 000bca8d706d ASoC: qcom: lpass-cpu: Fix fallback SD line index handling +]] + +These indices should reference the ID placed within the dai_driver +array, not the indices of the array itself. + +This fixes commit 4ff028f6c108 ("ASoC: qcom: lpass-cpu: Make I2S SD +lines configurable"), which among others, broke IPQ8064 audio +(sound/soc/qcom/lpass-ipq806x.c) because it uses ID 4 but we'd stop +initializing the mi2s_playback_sd_mode and mi2s_capture_sd_mode arrays +at ID 0. + +Fixes: 4ff028f6c108 ("ASoC: qcom: lpass-cpu: Make I2S SD lines configurable") +Cc: +Signed-off-by: Brian Norris +--- + sound/soc/qcom/lpass-cpu.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/sound/soc/qcom/lpass-cpu.c ++++ b/sound/soc/qcom/lpass-cpu.c +@@ -851,10 +851,11 @@ static void of_lpass_cpu_parse_dai_data( + struct lpass_data *data) + { + struct device_node *node; +- int ret, id; ++ int ret, i, id; + + /* Allow all channels by default for backwards compatibility */ +- for (id = 0; id < data->variant->num_dai; id++) { ++ for (i = 0; i < data->variant->num_dai; i++) { ++ id = data->variant->dai_driver[i].id; + data->mi2s_playback_sd_mode[id] = LPAIF_I2SCTL_MODE_8CH; + data->mi2s_capture_sd_mode[id] = LPAIF_I2SCTL_MODE_8CH; + }