From nobody Tue Mar 11 07:00:28 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDF88C001DC for ; Fri, 21 Jul 2023 13:23:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231624AbjGUNW7 (ORCPT ); Fri, 21 Jul 2023 09:22:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231439AbjGUNW1 (ORCPT ); Fri, 21 Jul 2023 09:22:27 -0400 Received: from mx0b-001ae601.pphosted.com (mx0a-001ae601.pphosted.com [67.231.149.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF2E13C0D for ; Fri, 21 Jul 2023 06:21:52 -0700 (PDT) Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.17.1.22/8.17.1.22) with ESMTP id 36LBeOqM003184; Fri, 21 Jul 2023 08:21:30 -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=z5eELqrUPimZhcyI9qZ8KUmBZfzfQMg7d/8kt8QGigM=; b= iKYXOtxz3hRf+/ZsSG5FQ8m+yPUj8eLF+mpPAYMzik7JK5Y93nbDlhlNrAD0PADA 6VzQsODetoHuxvbE3E3s7YGl36kLH4CAumMFhzGp8L6I0S0ztgbKtk8Cb6D4WYkD hN0aF7pqruFIGYKCzZ7Fs9Y32VCtBkO9udBEwDAW/0ii5UrSrM0yaHHteb1bXuR+ 37EuhDLZHn8EBFnLRHrTe/kEL/gf50wfmz0suGhGDOoL6vMcZLjhg9CU/v1J7TuC 5ms1CZBPW5IGARJL8GneEVP8DKtWxpffuhLhQDmzdmulBxalZ9mfW0/9R6g+vvdq wuYSJfhI4IPfja3aUEEkbA== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3rus62y4hx-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 21 Jul 2023 08:21:30 -0500 (CDT) 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_256_GCM_SHA384) id 15.2.1118.30; Fri, 21 Jul 2023 14:21:27 +0100 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.2.1118.30 via Frontend Transport; Fri, 21 Jul 2023 14:21:27 +0100 Received: from work-debian.ad.cirrus.com (unknown [198.61.64.172]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 2EF0046B; Fri, 21 Jul 2023 13:21:27 +0000 (UTC) From: Richard Fitzgerald To: , CC: , , , , Simon Trimmer , Richard Fitzgerald Subject: [PATCH v5 09/11] ASoC: cs35l56: Make a common function to shutdown the DSP Date: Fri, 21 Jul 2023 14:21:18 +0100 Message-ID: <20230721132120.5523-10-rf@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230721132120.5523-1-rf@opensource.cirrus.com> References: <20230721132120.5523-1-rf@opensource.cirrus.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: 5JKmFXj-6A12U5Pm6jtgZdy8xmC1P-wT X-Proofpoint-ORIG-GUID: 5JKmFXj-6A12U5Pm6jtgZdy8xmC1P-wT X-Proofpoint-Spam-Reason: safe Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Simon Trimmer Move issuing of a CS35L56_MBOX_CMD_SHUTDOWN command and then waiting for the DSP to reach CS35L56_HALO_STATE_SHUTDOWN in the register appropriate for the hardware revision into a common function. Signed-off-by: Simon Trimmer Signed-off-by: Richard Fitzgerald Acked-by: Mark Brown --- include/sound/cs35l56.h | 1 + sound/soc/codecs/cs35l56-shared.c | 26 ++++++++++++++++++++++++++ sound/soc/codecs/cs35l56.c | 17 +---------------- 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/include/sound/cs35l56.h b/include/sound/cs35l56.h index 79e117abee06..3950322bf3cb 100644 --- a/include/sound/cs35l56.h +++ b/include/sound/cs35l56.h @@ -274,6 +274,7 @@ extern const unsigned int cs35l56_tx_input_values[CS35L= 56_NUM_INPUT_SRC]; =20 int cs35l56_set_patch(struct cs35l56_base *cs35l56_base); int cs35l56_mbox_send(struct cs35l56_base *cs35l56_base, unsigned int comm= and); +int cs35l56_firmware_shutdown(struct cs35l56_base *cs35l56_base); 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); diff --git a/sound/soc/codecs/cs35l56-shared.c b/sound/soc/codecs/cs35l56-s= hared.c index 4e3becb9581d..ae373f335ea8 100644 --- a/sound/soc/codecs/cs35l56-shared.c +++ b/sound/soc/codecs/cs35l56-shared.c @@ -213,6 +213,32 @@ int cs35l56_mbox_send(struct cs35l56_base *cs35l56_bas= e, unsigned int command) } EXPORT_SYMBOL_NS_GPL(cs35l56_mbox_send, SND_SOC_CS35L56_SHARED); =20 +int cs35l56_firmware_shutdown(struct cs35l56_base *cs35l56_base) +{ + int ret; + unsigned int reg; + unsigned int val; + + ret =3D cs35l56_mbox_send(cs35l56_base, CS35L56_MBOX_CMD_SHUTDOWN); + if (ret) + return ret; + + if (cs35l56_base->rev < CS35L56_REVID_B0) + reg =3D CS35L56_DSP1_PM_CUR_STATE_A1; + else + reg =3D CS35L56_DSP1_PM_CUR_STATE; + + ret =3D regmap_read_poll_timeout(cs35l56_base->regmap, reg, + val, (val =3D=3D CS35L56_HALO_STATE_SHUTDOWN), + CS35L56_HALO_STATE_POLL_US, + CS35L56_HALO_STATE_TIMEOUT_US); + if (ret < 0) + dev_err(cs35l56_base->dev, "Failed to poll PM_CUR_STATE to 1 is %d (ret = %d)\n", + val, ret); + return ret; +} +EXPORT_SYMBOL_NS_GPL(cs35l56_firmware_shutdown, SND_SOC_CS35L56_SHARED); + int cs35l56_wait_for_firmware_boot(struct cs35l56_base *cs35l56_base) { unsigned int reg; diff --git a/sound/soc/codecs/cs35l56.c b/sound/soc/codecs/cs35l56.c index d06b83dfc462..19b6b4fbe5de 100644 --- a/sound/soc/codecs/cs35l56.c +++ b/sound/soc/codecs/cs35l56.c @@ -673,8 +673,6 @@ static void cs35l56_secure_patch(struct cs35l56_private= *cs35l56) =20 static void cs35l56_patch(struct cs35l56_private *cs35l56) { - unsigned int reg; - unsigned int val; int ret; =20 /* @@ -691,23 +689,10 @@ static void cs35l56_patch(struct cs35l56_private *cs3= 5l56) flush_work(&cs35l56->sdw_irq_work); } =20 - ret =3D cs35l56_mbox_send(&cs35l56->base, CS35L56_MBOX_CMD_SHUTDOWN); + ret =3D cs35l56_firmware_shutdown(&cs35l56->base); if (ret) goto err; =20 - if (cs35l56->base.rev < CS35L56_REVID_B0) - reg =3D CS35L56_DSP1_PM_CUR_STATE_A1; - else - reg =3D CS35L56_DSP1_PM_CUR_STATE; - - ret =3D regmap_read_poll_timeout(cs35l56->base.regmap, reg, - val, (val =3D=3D CS35L56_HALO_STATE_SHUTDOWN), - CS35L56_HALO_STATE_POLL_US, - CS35L56_HALO_STATE_TIMEOUT_US); - if (ret < 0) - dev_err(cs35l56->base.dev, "Failed to poll PM_CUR_STATE to 1 is %d (ret = %d)\n", - val, ret); - /* Use wm_adsp to load and apply the firmware patch and coefficient files= */ ret =3D wm_adsp_power_up(&cs35l56->dsp); if (ret) { --=20 2.30.2