Received: by 2002:a05:7412:d1aa:b0:fc:a2b0:25d7 with SMTP id ba42csp899155rdb; Tue, 30 Jan 2024 01:47:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IE/2+LtfGXdDQ3iBvk3iAR0qM5b7W7MqHTCt/JNwLJeBn6yFbeG6p2UaJ+oEtemIMeuqm+e X-Received: by 2002:a05:6102:a8d:b0:46b:1c47:c823 with SMTP id n13-20020a0561020a8d00b0046b1c47c823mr3847410vsg.45.1706608061680; Tue, 30 Jan 2024 01:47:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706608061; cv=pass; d=google.com; s=arc-20160816; b=wBdsRfabGNs+zGMxk4PjCsFXa5IouvEy9oRzUZu/sWWrQNg3Kx+6pYYr6Ua2BGqB0q /He00FJ2aSIpBG5W6Frd7BuXVf1RjOLD7rzFiPM2HsYtgjj9pCw9u57zKpII7seEJmSO q7v0U1PWqmgDIQRCXKIQAxxeABJZtB9DW0lFkLb8XrRV1vDPgerw4NN3qy+nLnZN15Ho 27R5KPtc0SlN2nNjDefzuZn88WpXSxPB23rUktdYHnPVaer1o7jEt30boBGDR8kVKsBI MLl49R2HUGHMzIufc0y/63sbfMrHtDUqdQpvEH/ADuDvJTXSXIVFHuIFQDUL7N+UnFzb itXQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=5g5TWNRBFDfVCV8mhZW0j/S3HkCXMZqyh6MkqNv1owc=; fh=2IEPXKfVhtoEq98sN8HxvD68vbFBiQMtPfzbhuI145g=; b=Pg0fhQbg0edTKX0CGvULgCkxTj7wVkrHHs4BfNgqFdHQNdncjDBbhZNF83M5TKZsfj R8nsaEpfBraFs64ls0F8G+QkpQFn6HjjkG2sbTx7EMYZ3DjQwhoB/UZyLaih9jRS6/6/ MbOX+CAbZurEhzHxY07yzUistAB8qMRdZjF2l/Hdy+VceMVHRwLY3rIhZ5aVlRiPek/+ WglH7EpooOhtkLXZEB+xp3HYliNj6VZLjvXwK0PYzIctx6Hazj/JqTkCb0S+W32GZ1Ph D41PiN4u0lYobIxCpgVAPTuLemcchlOcNLOxqBMoqPlhEXnDTuupu+cDRg7qicKIx0yv rHuQ== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=altlinux.org); spf=pass (google.com: domain of linux-kernel+bounces-44292-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-44292-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id r15-20020a05620a298f00b0078331069e2esi9979790qkp.555.2024.01.30.01.47.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 01:47:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-44292-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=altlinux.org); spf=pass (google.com: domain of linux-kernel+bounces-44292-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-44292-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 6922E1C252BB for ; Tue, 30 Jan 2024 09:47:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 468CC60896; Tue, 30 Jan 2024 09:47:27 +0000 (UTC) Received: from air.basealt.ru (air.basealt.ru [194.107.17.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A8E6F605B4; Tue, 30 Jan 2024 09:47:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.107.17.39 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706608046; cv=none; b=heEHMNZc1ryKXrLcCYJLrrQfzXsqqxEg6QI5b6Ay6X5XLVTuKEND5tOGEKqPP31VrlfA36ZJ+OsLUJateBZOHe5DGL/po+0On4VxDcN7x6l/x0ZpprvCKDuFlRFceU34UG0mILMeiVT9geOD7WByGPI4WWLPgm+wKqQ1ysafY0k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706608046; c=relaxed/simple; bh=vklX8QdJvVdaDTo9uEek4zgLDUE4n5/BjuBqUcTksoc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=LsAYlu/am6mC3nXK/t5J0H5Yx+1dOavs2DMygy40fCo/d2ldbPTyjBMme6hf8uKc4reFCZF9+ucakaB+VDYIXm/0FPxdIYMlW4hqotD4kv3JRGIW4bEYxCTo/mVnzTrH/aOexqIcqp61HOOvSw7iU3ITgH9fIW+JxbYUA2hHxFA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org; spf=pass smtp.mailfrom=altlinux.org; arc=none smtp.client-ip=194.107.17.39 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=altlinux.org Received: by air.basealt.ru (Postfix, from userid 490) id C2EA52F2023D; Tue, 30 Jan 2024 09:47:22 +0000 (UTC) X-Spam-Level: Received: from altlinux.malta.altlinux.ru (obninsk.basealt.ru [217.15.195.17]) by air.basealt.ru (Postfix) with ESMTPSA id 158A22F20248; Tue, 30 Jan 2024 09:47:15 +0000 (UTC) From: kovalev@altlinux.org To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, u.kleine-koenig@pengutronix.de, a.firago@yadro.com, sashal@kernel.org, zhuning0077@gmail.com, tiwai@suse.com, perex@perex.cz, broonie@kernel.org, lgirdwood@gmail.com, kovalev@altlinux.org Subject: [PATCH 6.1.y 4/7] ASoC: codecs: ES8326: Change Volatile Reg function Date: Tue, 30 Jan 2024 12:47:05 +0300 Message-Id: <20240130094708.290485-5-kovalev@altlinux.org> X-Mailer: git-send-email 2.33.8 In-Reply-To: <20240130094708.290485-1-kovalev@altlinux.org> References: <20240130094708.290485-1-kovalev@altlinux.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Zhu Ning Commit f1230a27c14b4d05e1d6af02be55c617b53728a4 upstream. The new calibration and headphone detection function require reading new volatile registers. Add them in the volatile register function. Signed-off-by: Zhu Ning Link: https://lore.kernel.org/r/20230717033223.42506-2-zhuning0077@gmail.com Signed-off-by: Mark Brown Signed-off-by: Vasiliy Kovalev --- sound/soc/codecs/es8326.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/sound/soc/codecs/es8326.c b/sound/soc/codecs/es8326.c index e953c0157ba03f..7cfe535e0b6da4 100644 --- a/sound/soc/codecs/es8326.c +++ b/sound/soc/codecs/es8326.c @@ -158,20 +158,25 @@ static const struct snd_soc_dapm_route es8326_dapm_routes[] = { {"HPOR", NULL, "RHPMIX"}, }; -static const struct regmap_range es8326_volatile_ranges[] = { - regmap_reg_range(ES8326_HPDET_STA, ES8326_HPDET_STA), -}; - -static const struct regmap_access_table es8326_volatile_table = { - .yes_ranges = es8326_volatile_ranges, - .n_yes_ranges = ARRAY_SIZE(es8326_volatile_ranges), -}; +static bool es8326_volatile_register(struct device *dev, unsigned int reg) +{ + switch (reg) { + case ES8326_HPL_OFFSET_INI: + case ES8326_HPR_OFFSET_INI: + case ES8326_HPDET_STA: + case ES8326_CTIA_OMTP_STA: + case ES8326_CSM_MUTE_STA: + return true; + default: + return false; + } +} static const struct regmap_config es8326_regmap_config = { .reg_bits = 8, .val_bits = 8, .max_register = 0xff, - .volatile_table = &es8326_volatile_table, + .volatile_reg = es8326_volatile_register, .cache_type = REGCACHE_RBTREE, }; -- 2.33.8