From patchwork Thu Nov 23 09:47:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 16987 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp329872vqx; Thu, 23 Nov 2023 01:48:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IHeyF9bf9rwYTBB/TRV+3+W1pvng/opuSUBYgcMY4D32vICJAkac9XTK768H1XuUsrj2F9/ X-Received: by 2002:a05:6a20:4417:b0:187:cf88:1a34 with SMTP id ce23-20020a056a20441700b00187cf881a34mr5529741pzb.8.1700732926463; Thu, 23 Nov 2023 01:48:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700732926; cv=none; d=google.com; s=arc-20160816; b=fkmpg8yQEUXnDz4ReK59VzWqfnRpQLcUfiDPvcQJXVV83LddyUlM69/EHopdC+OMg8 m7a0ffB1x36QSQe9xLglal2v21UnfReCrz5Ch7YXRTrxOdAhP7y2dEZk7AgTzDLONmBr Ki8MpkhCmomfTMTRF7BZrkmm3WpNTAcC9YmHb0LB/OaYdd5rhSvk4WAj4euDF7pdEg50 Wy9irG55Gi3Fqn2mTTXlqXluNaAyhb7WjHThxVGTi4jStG+wgE+l83JrQ6ivrk6Ha2Kt DwknjzThG6AswMu2UIdZVA0ITLYE7lQFtP1lhP8a/hpdyXih+5jwbu3cwvqtG6Jueojl ukzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=5BfRLoAEIL/11jsuHW07U+aJ+7icyZeBBoqZpShActk=; fh=EOywSpABL9AHo6+q6370wYzHHRE/1/UYWoNrLaFosFI=; b=PaQ/6hKg4GUMqHKRaUPHpSOJQy/bAs8T6NfkZVIObtSw+a7tx/HR2GzMIAHHrw8FSo GFpvSuxKJrueuBHh0rzS+j1KeCe5B4ebtka/WhqvVqe2L44uosByGkDCmd2SvwYptyk6 gX/YUV4w6uZHGfsxkDriWn2w0wamWh9viQkTUOEz+W61uzZQkUXBidnW5N8eKXHKz8gW mIkrf31C19qqlly3znv7Ryg6fyABS6Ib5NT8JrxBCA3nGGRnANlmy/5EKB9cu/poZUII fPOCGN4063YeDVZ2GJ39cZzu/7dAdv20rjTmtUr5Tq0eYIC6R8HoI2BXn799JbONXJH8 Souw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sX9JcuMX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id b11-20020a170902d50b00b001cf647a0c3fsi827570plg.530.2023.11.23.01.48.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 01:48:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sX9JcuMX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 498418083AEB; Thu, 23 Nov 2023 01:48:43 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235084AbjKWJs1 (ORCPT + 99 others); Thu, 23 Nov 2023 04:48:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232747AbjKWJsS (ORCPT ); Thu, 23 Nov 2023 04:48:18 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85EC5D49 for ; Thu, 23 Nov 2023 01:48:24 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E8BAC433C9; Thu, 23 Nov 2023 09:48:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700732904; bh=hgdvnIPPccubzs/g8g1k94iDsPT4gPn3WhqGmyKIz/Q=; h=From:To:Cc:Subject:Date:From; b=sX9JcuMXDY3YUOTcFYDBGux0YFcW90U71oN5fOTga/3Cr1pc9vi7HXbzDi6cPpJXn I1nBnofehwbZwffToBqtvjgBL2TPIsFdgLC5XUTTnih0YAXJdNcBEcQMUEQqo1gOGb o2+Q64yIEH5q9AiDBU4sb2tOpHFBHB7Yt2Jf6F2NEyl2Cn+1z3RP3iOP6lYFsinFlD JBF9FKPF6zP8RZ85rkMTgoVAicxkEyQ+olwuSpjP1N39COnMvxJAAucnryBKTWpRB+ c2XxIJr1cCkd8we1AIv4QTjELF6i26ZyB3rCfbzj8OPbbrG2vT6HGampvAnjyAzsvC LpMS5+sAKX+Bw== Received: from johan by xi.lan with local (Exim 4.96.2) (envelope-from ) id 1r66K9-0005KO-1m; Thu, 23 Nov 2023 10:48:41 +0100 From: Johan Hovold To: Greg Kroah-Hartman Cc: Sasha Levin , Mark Brown , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Srinivas Kandagatla , linux-sound@vger.kernel.org, stable@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH stable-6.6 0/2] ASoC: codecs: wsa883x: fix pops and clicks Date: Thu, 23 Nov 2023 10:47:47 +0100 Message-ID: <20231123094749.20462-1-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Status: No, score=-1.3 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Thu, 23 Nov 2023 01:48:43 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783347728724007324 X-GMAIL-MSGID: 1783347728724007324 This is a backport of commits 0220575e65a ("ASoC: soc-dai: add flag to mute and unmute stream during trigger") 805ce81826c8 ("ASoC: codecs: wsa883x: make use of new mute_unmute_on_trigger flag") which specifically fix a loud crackling noise when starting a stream on the Lenovo ThinkPad X13s. These backports should apply to any stable tree which already has commit 3efcb471f871 ("ASoC: soc-pcm.c: Make sure DAI parameters cleared if the DAI becomes inactive") backported (e.g. 6.6.2 and 6.5.12). Note that the interaction of these commits resulted in a bad merge in mainline which is fixed up here: https://lore.kernel.org/lkml/20231123091815.21933-1-johan+linaro@kernel.org/ Johan Srinivas Kandagatla (2): ASoC: soc-dai: add flag to mute and unmute stream during trigger ASoC: codecs: wsa883x: make use of new mute_unmute_on_trigger flag include/sound/soc-dai.h | 1 + sound/soc/codecs/wsa883x.c | 7 +------ sound/soc/soc-dai.c | 7 +++++++ sound/soc/soc-pcm.c | 12 ++++++++---- 4 files changed, 17 insertions(+), 10 deletions(-)