From patchwork Thu May 25 15:06:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Fitzgerald X-Patchwork-Id: 99077 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp450588vqr; Thu, 25 May 2023 08:19:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7RpXGrQejWpbPMPVnshp7zw25QKl8DUxvCIVs2d9UcaC8kPpR1tmLL426kARIN+JdZXY7r X-Received: by 2002:a05:6a00:1883:b0:643:d40c:7db1 with SMTP id x3-20020a056a00188300b00643d40c7db1mr8461590pfh.3.1685027951253; Thu, 25 May 2023 08:19:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685027951; cv=none; d=google.com; s=arc-20160816; b=faWy+ywZaR4n3xl77KG2DCtq+Qe4JU9cxPiqA0O/JlTvVedhTgtuGWwiZox/RSwU5M Z1/FTfJm9FjvFPBomeGt3FRE9yl37Qtogam/fdibflu6oulc5uZ3aoF9iMESwYESvp+q n4rDjZr1F7oIV4OPC3wM/Eix23dCD9egpRUcpsp093h19LHPU0fPhQTZ+iqEIYWWV1KC donTma/ULOMITDr0WHe6QT98phpZ6oUDVN+zkAIqU2laOIk1Yd1X+TqtkaHXMkp3Hudu gduKKZH4s+vCaTEBZa/YQLle6jUcO6ul6cQK8vnCrUK7x3ENnUhIM9BboSiLEiTyNdZS Sm3A== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=t9bLP6gip12/PHB5/trJGtenoIkigKpfPCU+NntC3t0=; b=Wgq0oeE3MGq78d3/I99B5SKvNxKqBmcY0uoZ5mLGeV1i01o7ILbteOFpGt4nR3Desy R1Cshp6aFUL91i0knfnRUWbtLzRiGgI5YFOjaID/SfGSOhaOLGCQzQkw/wSMkABywfZw yxkOgWRxKIZFZmXM752O5GWKxPtEyzo5Rt0WIAZPLtVbSMyvnz8MMJY/qPH5KWnmOR8g eLhxE6N0vG3MDw/LhK/QIYDoghQ0BEquygSLViPbJ+WLcFmpBCWRMAhwm9goC7A+dgWe fa2isN72pwlGp4StHKYZzreT2ynk+CgaZUUdqTt2eJF65Fj5QXiKiuPXSZyg4you6dns SBEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=Pgetd0Eq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i184-20020a6387c1000000b0051f7686dfb7si1374734pge.189.2023.05.25.08.18.58; Thu, 25 May 2023 08:19:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=Pgetd0Eq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241613AbjEYPHv (ORCPT + 99 others); Thu, 25 May 2023 11:07:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241437AbjEYPHc (ORCPT ); Thu, 25 May 2023 11:07:32 -0400 Received: from mx0b-001ae601.pphosted.com (mx0b-001ae601.pphosted.com [67.231.152.168]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14436198 for ; Thu, 25 May 2023 08:07:31 -0700 (PDT) Received: from pps.filterd (m0077474.ppops.net [127.0.0.1]) by mx0b-001ae601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34PEE1BK025344; Thu, 25 May 2023 10:07:08 -0500 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=t9bLP6gip12/PHB5/trJGtenoIkigKpfPCU+NntC3t0=; b=Pgetd0Eq0S4+MOJNiAZ5pcl2zJnm3H/fG5M4bX8F8OQ3P8kX2Ajx7G7IEaZOFs5l/Pto Ly8vcUPJWZ1uiyfj9rAyXm1Okc+HtDLrCbnTZa3pbIGj3CSYsunJWeHai47DHAWhbUdt 0HNEA5txYGnDXtdKyYBPxD7YRsFitlhkzOyGWTlAXSXm7xnUcUTHOivW6FvlsnjHrAwV janPm0tKxpYpoHZfVIa16wcozbQR3kEUeyXNMdWZLg58iQ+Q3ugPhBzUhP5Yoq+BZKoh XMlkij2qhhAIEF1DI4hvvwPMCtofsFgQs07mwOSnowAk7cC0fhMPrBhPdtQpUon4SQ85 qw== Received: from ediex02.ad.cirrus.com ([84.19.233.68]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 3qptmm70m7-6 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 25 May 2023 10:07:08 -0500 Received: from ediex02.ad.cirrus.com (198.61.84.81) by ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Thu, 25 May 2023 10:07:05 -0500 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by anon-ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Thu, 25 May 2023 10:07:05 -0500 Received: from EDIN4L06LR3.ad.cirrus.com (EDIN4L06LR3.ad.cirrus.com [198.61.65.166]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id ADCCE15B4; Thu, 25 May 2023 15:07:04 +0000 (UTC) From: Richard Fitzgerald To: , , CC: , , , Simon Trimmer , Richard Fitzgerald Subject: [PATCH 09/13] ASoC: cs35l56: Make common function for control port wait Date: Thu, 25 May 2023 16:06:55 +0100 Message-ID: <20230525150659.25409-10-rf@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230525150659.25409-1-rf@opensource.cirrus.com> References: <20230525150659.25409-1-rf@opensource.cirrus.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: hxEFgU_Q7LSwsQUB2TaVfwlfIOQVzj34 X-Proofpoint-GUID: hxEFgU_Q7LSwsQUB2TaVfwlfIOQVzj34 X-Proofpoint-Spam-Reason: safe X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766879868861752921?= X-GMAIL-MSGID: =?utf-8?q?1766879868861752921?= From: Simon Trimmer Move the waits for CS35L56_CONTROL_PORT_READY_US into a common function, and also allow a wider range of allowed wait times. Signed-off-by: Simon Trimmer Signed-off-by: Richard Fitzgerald --- include/sound/cs35l56.h | 1 + sound/soc/codecs/cs35l56-shared.c | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/include/sound/cs35l56.h b/include/sound/cs35l56.h index 489a61f84325..ae9e8f55962a 100644 --- a/include/sound/cs35l56.h +++ b/include/sound/cs35l56.h @@ -275,6 +275,7 @@ extern const unsigned int cs35l56_tx_input_values[CS35L56_NUM_INPUT_SRC]; void cs35l56_reread_firmware_registers(struct cs35l56_base *cs35l56_base); int cs35l56_mbox_send(struct cs35l56_base *cs35l56_base, unsigned int command); int cs35l56_wait_for_firmware_boot(struct cs35l56_base *cs35l56_base); +void cs35l56_wait_control_port_ready(void); void cs35l56_wait_min_reset_pulse(void); void cs35l56_system_reset(struct cs35l56_base *cs35l56_base, bool is_soundwire); int cs35l56_irq_request(struct cs35l56_base *cs35l56_base, int irq); diff --git a/sound/soc/codecs/cs35l56-shared.c b/sound/soc/codecs/cs35l56-shared.c index e3b935bd9037..7e02d023338c 100644 --- a/sound/soc/codecs/cs35l56-shared.c +++ b/sound/soc/codecs/cs35l56-shared.c @@ -249,6 +249,13 @@ int cs35l56_wait_for_firmware_boot(struct cs35l56_base *cs35l56_base) } EXPORT_SYMBOL_NS_GPL(cs35l56_wait_for_firmware_boot, SND_SOC_CS35L56_SHARED); +void cs35l56_wait_control_port_ready(void) +{ + /* Wait for control port to be ready (datasheet tIRS). */ + usleep_range(CS35L56_CONTROL_PORT_READY_US, 2 * CS35L56_CONTROL_PORT_READY_US); +} +EXPORT_SYMBOL_NS_GPL(cs35l56_wait_control_port_ready, SND_SOC_CS35L56_SHARED); + void cs35l56_wait_min_reset_pulse(void) { /* Satisfy minimum reset pulse width spec */ @@ -275,7 +282,7 @@ void cs35l56_system_reset(struct cs35l56_base *cs35l56_base, bool is_soundwire) if (is_soundwire) return; - usleep_range(CS35L56_CONTROL_PORT_READY_US, CS35L56_CONTROL_PORT_READY_US + 400); + cs35l56_wait_control_port_ready(); regcache_cache_only(cs35l56_base->regmap, false); } EXPORT_SYMBOL_NS_GPL(cs35l56_system_reset, SND_SOC_CS35L56_SHARED); @@ -486,8 +493,7 @@ int cs35l56_runtime_resume_common(struct cs35l56_base *cs35l56_base, bool is_sou cs35l56_hibernate_wake_seq, ARRAY_SIZE(cs35l56_hibernate_wake_seq)); - usleep_range(CS35L56_CONTROL_PORT_READY_US, - CS35L56_CONTROL_PORT_READY_US + 400); + cs35l56_wait_control_port_ready(); } out_sync: @@ -561,9 +567,7 @@ int cs35l56_hw_init(struct cs35l56_base *cs35l56_base) if (!cs35l56_base->reset_gpio) regmap_read(cs35l56_base->regmap, CS35L56_DSP_VIRTUAL1_MBOX_1, &devid); - /* Wait for control port to be ready (datasheet tIRS). */ - usleep_range(CS35L56_CONTROL_PORT_READY_US, - CS35L56_CONTROL_PORT_READY_US + 400); + cs35l56_wait_control_port_ready(); /* * The HALO_STATE register is in different locations on Ax and B0