Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3058679pxf; Mon, 5 Apr 2021 01:58:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwhaZ56kiUwwCL2+mMhpWjKg5CjK95l6wpqtIvC433fVUwnXtPmCaUr5c/ohpSNHPV/0j0A X-Received: by 2002:aa7:d385:: with SMTP id x5mr30527417edq.289.1617613096539; Mon, 05 Apr 2021 01:58:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617613096; cv=none; d=google.com; s=arc-20160816; b=BdZFrfPHA89UHXqDy/WVdmlQY4gbRuAta4AjDXfMepeI6crA/Ev0sN/y1xT6Kzzulc U85D5VVgdTKLF3H/X28hNzeS83yVOIDCBncSRbYnYIYFyF6Svj99x1ELKKkSa3dlACK9 aY8oGZROHBo7SVAj7QjvwN6rb4eD0IyOmPmnfVsea4gB/N8aO9Xq+iaqHwdUqBowWdoD ZY5Hw6k3Wgy+2YbD6KTwZFU1sQa7zY4WVg7amgL9hHDKROcalK/a+cEr8MgBELDUs+Pf Lb6Orx8bUC92qp21Dt9W0ts44uFBf3HoSeHbiSUQOXqEKYnl47rzl94fhi0pHiNozLrD WFsA== 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=07dXIMgJwRXOnehfIlOzmwe/7brz6DmRiZML/T0rPIk=; b=UBP2b/9cQVvnoMd27+EMrFB/9XEhmziHppk50BPp4B21DzeQRdVqpbzUjQuVUpGzOH Cn/s+k3dPYd606PGmELNjTNThfwqGa+21GizitFqLwz/INN9mAqpe04HHNDO2r5AY9dn KLlieWDDan9/3AmeYhQJs+kjUYS7O9oJj1WR7n7pUbxc9EDqhc0F41FKyWd0cGI4jNEu q2uiuMXe8jXtjyPLMv/Ue243K0WeuZHiFwS71MEoPHNJAtWcuFv+XzLBTvFmlTVvQ5WI aRw6pdTAoJPyYW/xv+Bpq18GGXYwZTTI2IMNH4RdtAKJXyQrEdOxC74d/ZO7E9g2GHyH h+ZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Lr3XLs83; 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 si5si2285611ejb.754.2021.04.05.01.57.53; Mon, 05 Apr 2021 01:58:16 -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=Lr3XLs83; 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 S232569AbhDEI4m (ORCPT + 99 others); Mon, 5 Apr 2021 04:56:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:34754 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232933AbhDEI4V (ORCPT ); Mon, 5 Apr 2021 04:56:21 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 56FE761393; Mon, 5 Apr 2021 08:56:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617612975; bh=UxLsPzwO5ONpBZzvgEppjZShrZzghNaBp5YvTiXr1vo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Lr3XLs83t3PCHEu28Jh+UlRH43ak/cmGnlQCx5biwjHn3ksepV0t9Zd5y3MRnjAAB AyG2ydQEea7hcFmenWXz91tCE6X+ehKO+bWMh/Md4kXApHII4sXHJXewO9PDmiG+tA UAnxseht1Q/ImjYnxnJk5hzQMayE9C3YYoqBZNP0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Benjamin Rood , Fabio Estevam , Mark Brown , Sasha Levin Subject: [PATCH 4.4 07/28] ASoC: sgtl5000: set DAP_AVC_CTRL register to correct default value on probe Date: Mon, 5 Apr 2021 10:53:41 +0200 Message-Id: <20210405085017.251351832@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210405085017.012074144@linuxfoundation.org> References: <20210405085017.012074144@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: Benjamin Rood [ Upstream commit f86f58e3594fb0ab1993d833d3b9a2496f3c928c ] According to the SGTL5000 datasheet [1], the DAP_AVC_CTRL register has the following bit field definitions: | BITS | FIELD | RW | RESET | DEFINITION | | 15 | RSVD | RO | 0x0 | Reserved | | 14 | RSVD | RW | 0x1 | Reserved | | 13:12 | MAX_GAIN | RW | 0x1 | Max Gain of AVC in expander mode | | 11:10 | RSVD | RO | 0x0 | Reserved | | 9:8 | LBI_RESP | RW | 0x1 | Integrator Response | | 7:6 | RSVD | RO | 0x0 | Reserved | | 5 | HARD_LMT_EN | RW | 0x0 | Enable hard limiter mode | | 4:1 | RSVD | RO | 0x0 | Reserved | | 0 | EN | RW | 0x0 | Enable/Disable AVC | The original default value written to the DAP_AVC_CTRL register during sgtl5000_i2c_probe() was 0x0510. This would incorrectly write values to bits 4 and 10, which are defined as RESERVED. It would also not set bits 12 and 14 to their correct RESET values of 0x1, and instead set them to 0x0. While the DAP_AVC module is effectively disabled because the EN bit is 0, this default value is still writing invalid values to registers that are marked as read-only and RESERVED as well as not setting bits 12 and 14 to their correct default values as defined by the datasheet. The correct value that should be written to the DAP_AVC_CTRL register is 0x5100, which configures the register bits to the default values defined by the datasheet, and prevents any writes to bits defined as 'read-only'. Generally speaking, it is best practice to NOT attempt to write values to registers/bits defined as RESERVED, as it generally produces unwanted/undefined behavior, or errors. Also, all credit for this patch should go to my colleague Dan MacDonald for finding this error in the first place. [1] https://www.nxp.com/docs/en/data-sheet/SGTL5000.pdf Signed-off-by: Benjamin Rood Reviewed-by: Fabio Estevam Link: https://lore.kernel.org/r/20210219183308.GA2117@ubuntu-dev Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/sgtl5000.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index a3dd7030f629..321b1ac52bfd 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -78,7 +78,7 @@ static const struct reg_default sgtl5000_reg_defaults[] = { { SGTL5000_DAP_EQ_BASS_BAND4, 0x002f }, { SGTL5000_DAP_MAIN_CHAN, 0x8000 }, { SGTL5000_DAP_MIX_CHAN, 0x0000 }, - { SGTL5000_DAP_AVC_CTRL, 0x0510 }, + { SGTL5000_DAP_AVC_CTRL, 0x5100 }, { SGTL5000_DAP_AVC_THRESHOLD, 0x1473 }, { SGTL5000_DAP_AVC_ATTACK, 0x0028 }, { SGTL5000_DAP_AVC_DECAY, 0x0050 }, -- 2.30.1