From patchwork Tue Nov 23 16:31:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Tanure X-Patchwork-Id: 12636213 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 19DD9C433F5 for ; Wed, 24 Nov 2021 07:08:47 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 3596B166A; Wed, 24 Nov 2021 08:07:55 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 3596B166A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1637737725; bh=eR9VBQ1o61QlGdhpbHOSP9v+TKTTclczLWzRQG7T7Ek=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=ltIQ/6j5J0bjkejdQAjdCJj//HbBzNP9TivWrHc638kNPQ0YD/pFNIFs90iETlYYE Q8qNnaZ9m0qyF0SHmLbX/QNvTjRAH+bly3Wii9pNaQn/3oMnVSZor6scpOvp/5ou2L EEaxw65EOyNOZKYFeSsBoPoTT7yCDL6v1ljsQsJk= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id A48ECF804FB; Wed, 24 Nov 2021 08:05:59 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id DFB82F804FD; Tue, 23 Nov 2021 17:32:07 +0100 (CET) Received: from mx0b-001ae601.pphosted.com (mx0a-001ae601.pphosted.com [67.231.149.25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 9E390F804F2 for ; Tue, 23 Nov 2021 17:31:58 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9E390F804F2 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b="aS0EZ2Vj" Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1ANCeXB9012277; Tue, 23 Nov 2021 10:31:56 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=PODMain02222019; bh=3brB89ZjjL1+5gZabDKcSweNLeFIOFiD2/pzoTpGB34=; b=aS0EZ2Vju2RGGYiKQ/QPUiq5bMS3CShN71QKpNQd47oAq+Y4P/VVCd/YapN18CUJGmU7 1iKKOgvXCLPMJvhK3K8YnMxBWnXX3DpRgymWKiaIvagVz78Dtz57OiDxgDM8QNrP/pCt n3X8aVZlG2oLZYPA8tgOtQmL3ODtFmMdieXJsa9vRW29ppJYr+L6gROTOJ3eN6VQMTAO CNtLMrW8O2osht8cgmVodhRqq2n0SjFb0HSHZyp3I6C/mWHZudwggKm+cG+fhcKG6ije aU8Ve3bjEerPCMsLbvfe8I9HAjHt7I6Uy3zLLb/2SD9v3TLB2ufEbj1f7+fJttome0k3 qA== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3cg5ms21ng-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Tue, 23 Nov 2021 10:31:56 -0600 Received: from EDIEX01.ad.cirrus.com (198.61.84.80) by EDIEX01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Tue, 23 Nov 2021 16:31:55 +0000 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by EDIEX01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server id 15.1.2375.17 via Frontend Transport; Tue, 23 Nov 2021 16:31:55 +0000 Received: from aryzen.ad.cirrus.com (unknown [198.61.65.11]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 1766C2A1; Tue, 23 Nov 2021 16:31:55 +0000 (UTC) From: Lucas Tanure To: "Rafael J . Wysocki" , Len Brown , Hans de Goede , Mark Gross , "Liam Girdwood" , Jaroslav Kysela , Mark Brown , Takashi Iwai , Kailang Yang , Shuming Fan , "Pierre-Louis Bossart" , David Rhodes , Vitaly Rodionov Subject: [PATCH 06/11] ASoC: cs35l41: Move power initializations to reg_sequence Date: Tue, 23 Nov 2021 16:31:44 +0000 Message-ID: <20211123163149.1530535-7-tanureal@opensource.cirrus.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211123163149.1530535-1-tanureal@opensource.cirrus.com> References: <20211123163149.1530535-1-tanureal@opensource.cirrus.com> MIME-Version: 1.0 X-Proofpoint-GUID: F5c1oj581rDWt8ngW0Q1II8UAmHOrnin X-Proofpoint-ORIG-GUID: F5c1oj581rDWt8ngW0Q1II8UAmHOrnin X-Proofpoint-Spam-Reason: safe X-Mailman-Approved-At: Wed, 24 Nov 2021 08:05:53 +0100 Cc: Chris Chiu , Alexandre Belloni , Jack Yu , Lucas Tanure , Arnd Bergmann , Jeremy Szu , patches@opensource.cirrus.com, Elia Devito , alsa-devel@alsa-project.org, Werner Sembach , platform-driver-x86@vger.kernel.org, Hui Wang , linux-acpi@vger.kernel.org, Lars-Peter Clausen , Sami Loone , Cameron Berkenpas , linux-kernel@vger.kernel.org X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" ASoC and HDA systems for all revisions of CS35L41 will benefit from having this initialization, so add it to reg_sequence of each revision Signed-off-by: Lucas Tanure --- sound/soc/codecs/cs35l41-lib.c | 2 +- sound/soc/codecs/cs35l41.c | 29 +++++++++-------------------- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/sound/soc/codecs/cs35l41-lib.c b/sound/soc/codecs/cs35l41-lib.c index a13c5313f4e5..cd9be6fbf910 100644 --- a/sound/soc/codecs/cs35l41-lib.c +++ b/sound/soc/codecs/cs35l41-lib.c @@ -43,7 +43,7 @@ const struct reg_default cs35l41_reg[] = { { CS35L41_CLASSH_CFG, 0x000B0405 }, { CS35L41_WKFET_CFG, 0x00000111 }, { CS35L41_NG_CFG, 0x00000033 }, - { CS35L41_AMP_GAIN_CTRL, 0x00000273 }, + { CS35L41_AMP_GAIN_CTRL, 0x00000000 }, { CS35L41_GPIO1_CTRL1, 0xE1000001 }, { CS35L41_GPIO2_CTRL1, 0xE1000001 }, { CS35L41_MIXER_NGATE_CFG, 0x00000000 }, diff --git a/sound/soc/codecs/cs35l41.c b/sound/soc/codecs/cs35l41.c index 0a88c2f164d1..20edc40b2fab 100644 --- a/sound/soc/codecs/cs35l41.c +++ b/sound/soc/codecs/cs35l41.c @@ -1267,6 +1267,9 @@ static int cs35l41_handle_pdata(struct device *dev, } static const struct reg_sequence cs35l41_reva0_errata_patch[] = { + { CS35L41_DSP1_CCM_CORE_CTRL, 0x00000000 }, + { CS35L41_PWR_CTRL2, 0x00000000 }, + { CS35L41_AMP_GAIN_CTRL, 0x00000000 }, { 0x00000040, 0x00005555 }, { 0x00000040, 0x0000AAAA }, { 0x00003854, 0x05180240 }, @@ -1286,6 +1289,9 @@ static const struct reg_sequence cs35l41_reva0_errata_patch[] = { }; static const struct reg_sequence cs35l41_revb0_errata_patch[] = { + { CS35L41_DSP1_CCM_CORE_CTRL, 0x00000000 }, + { CS35L41_PWR_CTRL2, 0x00000000 }, + { CS35L41_AMP_GAIN_CTRL, 0x00000000 }, { 0x00000040, 0x00005555 }, { 0x00000040, 0x0000AAAA }, { CS35L41_VIMON_SPKMON_RESYNC, 0x00000000 }, @@ -1299,6 +1305,9 @@ static const struct reg_sequence cs35l41_revb0_errata_patch[] = { }; static const struct reg_sequence cs35l41_revb2_errata_patch[] = { + { CS35L41_DSP1_CCM_CORE_CTRL, 0x00000000 }, + { CS35L41_PWR_CTRL2, 0x00000000 }, + { CS35L41_AMP_GAIN_CTRL, 0x00000000 }, { 0x00000040, 0x00005555 }, { 0x00000040, 0x0000AAAA }, { CS35L41_VIMON_SPKMON_RESYNC, 0x00000000 }, @@ -1533,26 +1542,6 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, goto err; } - ret = regmap_write(cs35l41->regmap, CS35L41_DSP1_CCM_CORE_CTRL, 0); - if (ret < 0) { - dev_err(cs35l41->dev, "Write CCM_CORE_CTRL failed: %d\n", ret); - goto err; - } - - ret = regmap_update_bits(cs35l41->regmap, CS35L41_PWR_CTRL2, - CS35L41_AMP_EN_MASK, 0); - if (ret < 0) { - dev_err(cs35l41->dev, "Write CS35L41_PWR_CTRL2 failed: %d\n", ret); - goto err; - } - - ret = regmap_update_bits(cs35l41->regmap, CS35L41_AMP_GAIN_CTRL, - CS35L41_AMP_GAIN_PCM_MASK, 0); - if (ret < 0) { - dev_err(cs35l41->dev, "Write CS35L41_AMP_GAIN_CTRL failed: %d\n", ret); - goto err; - } - ret = cs35l41_set_pdata(cs35l41); if (ret < 0) { dev_err(cs35l41->dev, "Set pdata failed: %d\n", ret);