Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3931162pxj; Mon, 21 Jun 2021 09:37:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwy5PjqIqUFlLWAJ6a5tcssQHa+Hkueuf9X+ejOQIxrFRvqwjyc3X8Pv2CINuUP/trHmc4R X-Received: by 2002:a17:906:144b:: with SMTP id q11mr25353384ejc.478.1624293443844; Mon, 21 Jun 2021 09:37:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624293443; cv=none; d=google.com; s=arc-20160816; b=kzHB7KYmu/izUsFTmsLk1XriZmd1B5bCYHp9Xst3xcQDsy94YvihDmgdr/jcC3ouos QsnxcBFCmjwMAf6zLc9uOBjL/bYgNjwH2FnWUPnIOlExHJGafWDovaNiDUcmpS01BIXV nhusvUjC2aF3wAsP8bwi+glZ6djdt/yoMpMMpL18ddOE7j6T6PolW2Js4ICsgBHZBIWU JH1FKR9xIZjWe8VkP9/wVx3uBTkGWJsJk71oPRZrFCxtk4V3psHZT/ZAW/t6bGgqzH0x AxfBgYrsZjje8Fz+LVZHTVKqvuDh566S3k1Ldu0/j6rZO1GVvR1JZn3kA2lf0t8fJTUf ROnQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=bl2kGhiq/kEUnhZHiCiTC+LGysfqhh3Kwp5lgqD42vs=; b=WfIX8q+UuZkilETwTfAo6HS7mcOZ4SrlEqxJcmQzk2F9D4V7icTK0lH41xvC9/zB/A qcDa4m6yTu+MdNYN0V32dfihscU9s/Y9p+ZmZhPLEUOE+6u/+tQaB4cRd71da/70vVew I8jzG5YCpuZTaxzzFvkECaAQHfHozL5OLmpA5RJKhQrXLunYJ81hkFtDt8tF50faj3uD mcdoJdHmPN25sHiyB9mqZWyNOYSAfR06vUmM7omr/PNg04Dvu3A5HkjhLJk8xDn006YJ K7OHNFLI5CYPq70/QpmUNTwzS7Gu7GfD1vnwAId0t/jY7im2BiWt5boKdPE3Yys+QknN AFzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=TFhvH9wg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c26si11246877ejj.401.2021.06.21.09.37.01; Mon, 21 Jun 2021 09:37:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=TFhvH9wg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232424AbhFUQgR (ORCPT + 99 others); Mon, 21 Jun 2021 12:36:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:55204 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231918AbhFUQcT (ORCPT ); Mon, 21 Jun 2021 12:32:19 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D6090613C5; Mon, 21 Jun 2021 16:26:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1624292762; bh=CL1FZxBMXtZzqlodM+oS8fWPPciTagavnSrueaHbjIg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TFhvH9wgx4xNBvoAuTtd2WRT0A0VpOAnsNRVxoEik38VVwdrvDE6avYvOS6bVEGRK cASBCo80VVlModmBX4A/kKxQdQB7mN50t7hwAUzqeUfphaV7sBeKixCUsas/8jNW4S m6qx+SIDp8hYSNMfJ8l/FprE1zAi/HtURh5R7RkM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Oder Chiou , Mark Brown , Sasha Levin Subject: [PATCH 5.10 087/146] ASoC: rt5682: Fix the fast discharge for headset unplugging in soundwire mode Date: Mon, 21 Jun 2021 18:15:17 +0200 Message-Id: <20210621154916.605940345@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210621154911.244649123@linuxfoundation.org> References: <20210621154911.244649123@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Oder Chiou [ Upstream commit 49783c6f4a4f49836b5a109ae0daf2f90b0d7713 ] Based on ("5a15cd7fce20b1fd4aece6a0240e2b58cd6a225d"), the setting also should be set in soundwire mode. Signed-off-by: Oder Chiou Link: https://lore.kernel.org/r/20210604063150.29925-1-oder_chiou@realtek.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/rt5682-sdw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt5682-sdw.c b/sound/soc/codecs/rt5682-sdw.c index 58fb13132602..aa6c325faeab 100644 --- a/sound/soc/codecs/rt5682-sdw.c +++ b/sound/soc/codecs/rt5682-sdw.c @@ -455,7 +455,8 @@ static int rt5682_io_init(struct device *dev, struct sdw_slave *slave) regmap_update_bits(rt5682->regmap, RT5682_CBJ_CTRL_2, RT5682_EXT_JD_SRC, RT5682_EXT_JD_SRC_MANUAL); - regmap_write(rt5682->regmap, RT5682_CBJ_CTRL_1, 0xd042); + regmap_write(rt5682->regmap, RT5682_CBJ_CTRL_1, 0xd142); + regmap_update_bits(rt5682->regmap, RT5682_CBJ_CTRL_5, 0x0700, 0x0600); regmap_update_bits(rt5682->regmap, RT5682_CBJ_CTRL_3, RT5682_CBJ_IN_BUF_EN, RT5682_CBJ_IN_BUF_EN); regmap_update_bits(rt5682->regmap, RT5682_SAR_IL_CMD_1, -- 2.30.2