From patchwork Thu May 25 16:26:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Fitzgerald X-Patchwork-Id: 99118 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp507287vqr; Thu, 25 May 2023 09:43:20 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ488i3JTPmF8FNNHiN7MsUaf+nLW09g0/akCqWV0yQ65cc2+bUU7ZIWgHPmuy2cbl75mJp6 X-Received: by 2002:a17:90a:674e:b0:253:8eea:cf with SMTP id c14-20020a17090a674e00b002538eea00cfmr2609698pjm.28.1685032999910; Thu, 25 May 2023 09:43:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685032999; cv=none; d=google.com; s=arc-20160816; b=sK/TMUHvL1Gyf3Zc4k8greXL9CfaE4/9HJLQqnj7icQTWk5nz3jha18CiRkIJxWC68 DYkstP9efKgsC5PWfyRtPhkTHKJB5MumJGJwx/nI7tGzLip/hB7uYnT6duRDV8H5M7az vb8SmTqhgXl5EiRWGxlgBJrn3G1S8mBTnwK+/rHOPkMbjUa+F1AQuoD4FfSACVeluOd3 v0sOClYgBZVHw7AkoR2jItLlDJRvPqGT2MjOAVLZrpZabQ2LmJYqjXbTqEyWvG2uA5am ushMDVp/Mput1zfhugL6Q8Oh2NSMGB/K2OaXHeqD2XuhUDB4XpVmEodPJzvo7TyaTv0x lM0w== 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=gjvF9y3c82RzHTgs5t2qAQVubD+R1HPBW6x2ID+7JwQ=; b=Mb/y89yxd+CLclUSqbgwysY+epboMOqmJ1g102jr9X4I1k/Kk+1N54794Q+vEE+JLO +0+zbdiZOz8aTdoniWXOohDNcpvuR9lP0mB/JUXqLn1yYUkJcREND5Rz2ykVRd+rdWBV aVsCdfKNVqUUgXEcazVCQLFESzwIVr/XscYgOelVFshA/8zDA/loJ9vwzGAjqFY26PlY NVxQKDF7UtTNRVtSq0HvGhXE9v5OvRzfKfrKNIqU6sVzwcosF40WT2ebsupyW/rAZ4KW 6gglE6ctTjLflfBTM/NBI4/LFU9pme5G5ZVm7QQAyyOGhS3hOw4WC++7oEFWWK8Sv5sl 4U1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b="nWmz/1Al"; 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 185-20020a6300c2000000b0052dcd67347asi1571236pga.382.2023.05.25.09.43.05; Thu, 25 May 2023 09:43:19 -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="nWmz/1Al"; 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 S240476AbjEYQ1K (ORCPT + 99 others); Thu, 25 May 2023 12:27:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240106AbjEYQ0o (ORCPT ); Thu, 25 May 2023 12:26:44 -0400 Received: from mx0b-001ae601.pphosted.com (mx0a-001ae601.pphosted.com [67.231.149.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EED6C195 for ; Thu, 25 May 2023 09:26:43 -0700 (PDT) Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34PEDsKf007206; Thu, 25 May 2023 11:26:26 -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=gjvF9y3c82RzHTgs5t2qAQVubD+R1HPBW6x2ID+7JwQ=; b=nWmz/1AlP/l6OEXkNA9zrHY9wulgH0lkBmtUkMqFU+KF6u3u6cA/uFGyUyDiA315DTFA 309BZdEgkLDdP6C/YeN7UHhMC1e2RsHehVg5aGLHxEbgawwViNQfBKTi5uGYbAEKE3E8 6hif9UERpppEIghkvzl4+7OZ8L6dEjvyqONQdhG3eGK1rgUFRL4SMnABWHyyNMWYLVxB r9fE51UQ4OBpiDsRFDw4cLLdvDMw1Q18LAYrg5EHLLz+OsQUNWv69HLyVpDRomkD8uUQ Y3LXCUb5x0QqrKuVQQKfW3WiM1Q0K8ZBu3tQ4xYrNO432UVVy/9rzlB4ilXHumkh2gOK Jw== Received: from ediex02.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3qsde8j0yh-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 25 May 2023 11:26:26 -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 11:26:23 -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 11:26:23 -0500 Received: from EDIN4L06LR3.ad.cirrus.com (EDIN4L06LR3.ad.cirrus.com [198.61.65.166]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id EE3EF45; Thu, 25 May 2023 16:26:22 +0000 (UTC) From: Richard Fitzgerald To: , , CC: , , , Simon Trimmer , Richard Fitzgerald Subject: [PATCH v2 02/12] ASoC: cs35l56: Make cs35l56_system_reset() code more generic Date: Thu, 25 May 2023 17:26:08 +0100 Message-ID: <20230525162618.20146-3-rf@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230525162618.20146-1-rf@opensource.cirrus.com> References: <20230525162618.20146-1-rf@opensource.cirrus.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: nXz9l52WywA_HN2ZERFCO4tI_cNZtKt5 X-Proofpoint-GUID: nXz9l52WywA_HN2ZERFCO4tI_cNZtKt5 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?1766885162563179598?= X-GMAIL-MSGID: =?utf-8?q?1766885162563179598?= From: Simon Trimmer The function can be more easily reused in HDA if the tracking of whether a soft reset is being performed and whether the device is connected to a SoundWire bus is moved out of the function. Signed-off-by: Simon Trimmer Signed-off-by: Richard Fitzgerald Acked-by: Mark Brown --- sound/soc/codecs/cs35l56.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/cs35l56.c b/sound/soc/codecs/cs35l56.c index 4d41c4b040a4..76cc9110d4e0 100644 --- a/sound/soc/codecs/cs35l56.c +++ b/sound/soc/codecs/cs35l56.c @@ -805,10 +805,8 @@ static const struct reg_sequence cs35l56_system_reset_seq[] = { REG_SEQ0(CS35L56_DSP_VIRTUAL1_MBOX_1, CS35L56_MBOX_CMD_SYSTEM_RESET), }; -static void cs35l56_system_reset(struct cs35l56_private *cs35l56) +static void cs35l56_system_reset(struct cs35l56_private *cs35l56, bool is_soundwire) { - cs35l56->soft_resetting = true; - /* * Must enter cache-only first so there can't be any more register * accesses other than the controlled system reset sequence below. @@ -819,7 +817,7 @@ static void cs35l56_system_reset(struct cs35l56_private *cs35l56) ARRAY_SIZE(cs35l56_system_reset_seq)); /* On SoundWire the registers won't be accessible until it re-enumerates. */ - if (cs35l56->sdw_peripheral) + if (is_soundwire) return; usleep_range(CS35L56_CONTROL_PORT_READY_US, CS35L56_CONTROL_PORT_READY_US + 400); @@ -886,7 +884,8 @@ static void cs35l56_patch(struct cs35l56_private *cs35l56) init_completion(&cs35l56->init_completion); - cs35l56_system_reset(cs35l56); + cs35l56->soft_resetting = true; + cs35l56_system_reset(cs35l56, !!cs35l56->sdw_peripheral); if (cs35l56->sdw_peripheral) { /* @@ -1550,7 +1549,8 @@ int cs35l56_init(struct cs35l56_private *cs35l56) if (!cs35l56->base.reset_gpio) { dev_dbg(cs35l56->base.dev, "No reset gpio: using soft reset\n"); - cs35l56_system_reset(cs35l56); + cs35l56->soft_resetting = true; + cs35l56_system_reset(cs35l56, !!cs35l56->sdw_peripheral); if (cs35l56->sdw_peripheral) { /* Keep alive while we wait for re-enumeration */ pm_runtime_get_noresume(cs35l56->base.dev);