From patchwork Fri Jan 13 05:32:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 1725691 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=rCAU40yT; 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=NOMDAWp+; 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 4NtVWp2KvCz23fd for ; Fri, 13 Jan 2023 16:36:05 +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=rCAU40yTZDK+p8 KZJ3ET0CLyrcIGeV2MMo5WfiKjZOaIDFlbYuET9pHo7iJaI7fqrBmbhUiomgas7EqfZ8U3MPFt8OS MgZl91MToTdZfzrJS7ItZ3NnnZz7H8J1NyugQjbyIzU8aAbXM8dn7HVgNdXT1FeV9QfO6vLMiaqrj dn6eTermqL9M56rYhQpPMT0+uwutlJKD04I58ImtNZkzmUxkf5qsFrddwm8iPIZUXK92B8P6oXRUT S7xcytuP1KOpVNwMQMIvQQe8u6Qh3ie+u7SW9wIWv8E452fDJakdll8bSPhlF14ifQSyTQaRaR3Gz WB3d6uecyaHn8usv97/A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pGCh8-000VdP-0O; Fri, 13 Jan 2023 05:33:38 +0000 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pGCg5-000VPu-M4 for openwrt-devel@lists.openwrt.org; Fri, 13 Jan 2023 05:32:36 +0000 Received: by mail-pj1-x1034.google.com with SMTP id o18so208643pji.1 for ; Thu, 12 Jan 2023 21:32:31 -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=NOMDAWp+7nnmKBJA40Ejda6j7gHetyo4XGbsrL3HFUorO05fnTbZO3MJk/6xjvNFpf yx7IKbs1491B5B67KPn0DKzqdjgTtPWjqImb/m+uu9exsB6VOHyRpqfmoXoVw04aKizy HluE+06Tm4qeErUlp6dPK7WVzCg9lTbV1zlTU4z6+vQiAvZiX9CqfXcHUiW8YzBLHVBO C9ta3p7+ElpAnuIFjI1h65oy1DWkiXFb5KZiJeOT+SZ6VZk8zn0Xtw8Eiq8qmtn8haSM ZemNSLF4P3XQ/5qHSlIYiqW671z3vnofzvAx46T0LlZ/J3LDNUIEjoYLPlvriQu2FFy6 kAow== 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=MCvLsQkIF9UY6+UbVd+HI0VYxdQ4qMOUWoqOzTw2iT6Mfh5sZ4GygOcVKBOixApqyz cXAcdePzkEAJ4ehyS0BPxT+DX0dfbjoXawOADBlxSWctGu1yzp4gaf6JObuPNNU85Rio p00gM5PRpGLA3lWKncM8hX8cqaFj7cqNm658i2preXVBmGNcdiY1YYSmRoFeepZjGGL5 uLgGtaXiUFyt8DKmSmdRJKhU4z/lW8335EwL98WdK1xSrFqiXCiphYvpmXytRaORtrfk IOfWB5fsSYB+jhx1gEzOqLogDi5aELdore5mcuqZjDh+uAA2erb1G0eUzfC3fmppe72c JLCw== X-Gm-Message-State: AFqh2koYeKqjMKQF6yDzrfyquNhp0zWt4OzT1OlikoSTOvhqZzjiK6mU KXJ5m05QviGAET/jXCy5od2G3N82sbQ= X-Google-Smtp-Source: AMrXdXvwAqG6SsnkTnOSmcIKchY/E5Nokgh+AphyBP2nozegvDuS6IE//HZ7AHgijCzgqv4AvOtOdA== X-Received: by 2002:a17:902:e18b:b0:194:3f40:69b3 with SMTP id y11-20020a170902e18b00b001943f4069b3mr10339687pla.31.1673587950648; Thu, 12 Jan 2023 21:32:30 -0800 (PST) Received: from localhost ([2600:1700:38c1:1d7f:f66d:4ff:fe3c:3ceb]) by smtp.gmail.com with ESMTPSA id b15-20020a170902650f00b00188f3970d4asm13118889plk.163.2023.01.12.21.32.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Jan 2023 21:32:30 -0800 (PST) From: Brian Norris To: openwrt-devel@lists.openwrt.org Cc: Brian Norris Subject: [PATCH v4 4/7] ipq806x: ASoC: qcom: lpass-cpu: Fix fallback SD line index handling Date: Thu, 12 Jan 2023 21:32:19 -0800 Message-Id: <20230113053222.2011958-4-computersforpeace@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230113053222.2011958-1-computersforpeace@gmail.com> References: <20230113053222.2011958-1-computersforpeace@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230112_213234_583305_C0809C9C X-CRM114-Status: GOOD ( 17.07 ) 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:1034 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; + }