From patchwork Mon Jan 2 23:25:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 1720843 X-Patchwork-Delegate: ynezz@true.cz 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=UGvdz+mn; 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=hZMQLBFV; 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 4NmBwK2WY9z23f3 for ; Tue, 3 Jan 2023 10:32:00 +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=3obcsagPWaeOCVmt4xmoyxBr4Tdc8PkAnmIr+Tve+50=; b=UGvdz+mnL+7+NK ZfSDmkBiqgGOxTjX6ryyyMrEVzzTVoZS+sjIcTqBWtjbkqoIoJJJOY/wW1aJnKkmcR8wCFP45FFtm A2l9MAvsDY+kZaU6JqEQDwDEdcp1DhXWb/Q0pknBAbhQPSe54Djn50lWKWiOJ3B9MhWVRCCtatiHT YY1DGxaJ3MDfOLW4/Gex2Y2kMJTGc/7XJ07lWyJOwL6h9NI0KLENQjMXdwZvKC+2rp2VsCKM7ViZQ XacdR+M/Vqj2kGVcpchFV0A9NPpz7rjQZVXZdmpLfzhEv6DTV+icCyQ5zUSpNATsJZlfMbqeEcyx5 OYLNyIWQQuRp1ai0Zx6g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pCUEa-00ErXw-LK; Mon, 02 Jan 2023 23:28:48 +0000 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pCUBk-00Eqr2-1D for openwrt-devel@lists.openwrt.org; Mon, 02 Jan 2023 23:25:53 +0000 Received: by mail-pl1-x62a.google.com with SMTP id m4so30887525pls.4 for ; Mon, 02 Jan 2023 15:25:48 -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=GqDIEIGLH+KEioSZbtRDfpB9iB16OyDzJmETWQX5+ls=; b=hZMQLBFVndqhVIhHf7DtI299mvUzrhGc0eP5NqWO1qHhGDHTk0xFMkxYPSACakm2QE GkW0cgyIU+nKxitp51mGr0grS3m6MEynLk4t0J+XOJfaodBsZci01PHzQrevhZkxn5fA e3k6uEE6kMdtqNY879b8V/F/1n/NL/O9aMQJx5+EoRO1xw7OjQTAz5Ivq15so9kscUV1 rLskxJan7WmAQFLPjU9Q0rpas+Zf5eNztI6ydGNfKmnu6cpEaiSAXmXHAP7nkvjYKfpH bD2Mj6wZQ/DveZu0dLQZHFuXaO+NTIeC//1Owi9sGqPkmEApDY7js6saugJi46KOjzb4 e7bA== 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=GqDIEIGLH+KEioSZbtRDfpB9iB16OyDzJmETWQX5+ls=; b=K0676nMivA+6q1knP7N3huz1l805ZYUh3bBnG+2Bawmx+bYorpRh8A1vXwc7B49Kbt UagFAncQFL/1Qr6jz+640FtimvAL5/D/Vbvd/Dc6RhKDP3bBWJOx/PximTgrAWiFd7hN qfCPfTOotHwPxIZGRvCECxFMOuzoXO9lkT6jK4AU8ID/om9IjmU+jzjpbJqNHx7Z6gG/ 4e+zRj+M7/Ay2SRORF7kZRnaAJHAYvrMOTAvtApCyyfdfIZSFCgf4soxZfiAnqCElUvO 2nagLMztz3tmPqiwPaM4UGBiDori94LNmZV4dxOI8MqbJhEySK5Q6njYPB7wY75TCQpm hbdw== X-Gm-Message-State: AFqh2kqeUwXJpzE/CPZ07qNmxs3sFz/rnmnAQs9ZLzfWas5bMYUSuGrM sHA8WbealedBbdik9y2KyHtwE60qDrk= X-Google-Smtp-Source: AMrXdXuhkE+2D1fK4dV63fAAWSZeLvJtpQbL0UNN/hQ2Xa8UuCqiyr8H9oDlxMYeJsvR9tPF7jbYnA== X-Received: by 2002:a17:90b:3597:b0:219:b1f0:ddf0 with SMTP id mm23-20020a17090b359700b00219b1f0ddf0mr46396475pjb.36.1672701947860; Mon, 02 Jan 2023 15:25:47 -0800 (PST) Received: from localhost ([2600:1700:38c1:1d7f:f66d:4ff:fe3c:3ceb]) by smtp.gmail.com with ESMTPSA id le14-20020a17090b150e00b00219eefe47c7sm17480814pjb.47.2023.01.02.15.25.47 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Jan 2023 15:25:47 -0800 (PST) From: Brian Norris To: openwrt-devel@lists.openwrt.org Cc: Brian Norris Subject: [PATCH 5/8] ipq8064: ASoC: qcom: lpass-cpu: Fix fallback SD line index handling Date: Mon, 2 Jan 2023 15:25:31 -0800 Message-Id: <20230102232534.592501-5-computersforpeace@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230102232534.592501-1-computersforpeace@gmail.com> References: <20230102232534.592501-1-computersforpeace@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230102_152552_163935_F5F11DEE X-CRM114-Status: GOOD ( 17.53 ) 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) upstream. Signed-off-by: Brian Norris --- 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:62a 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) upstream. Signed-off-by: Brian Norris --- ...cpu-Fix-fallback-SD-line-index-handl.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 target/linux/ipq806x/patches-5.15/902-ASoC-qcom-lpass-cpu-Fix-fallback-SD-line-index-handl.patch diff --git a/target/linux/ipq806x/patches-5.15/902-ASoC-qcom-lpass-cpu-Fix-fallback-SD-line-index-handl.patch b/target/linux/ipq806x/patches-5.15/902-ASoC-qcom-lpass-cpu-Fix-fallback-SD-line-index-handl.patch new file mode 100644 index 000000000000..0bdab5dc62a5 --- /dev/null +++ b/target/linux/ipq806x/patches-5.15/902-ASoC-qcom-lpass-cpu-Fix-fallback-SD-line-index-handl.patch @@ -0,0 +1,39 @@ +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/ ]] + +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; + }