From: Richard Fitzgerald <rf@opensource.cirrus.com>
To: <tiwai@suse.com>, <broonie@kernel.org>, <perex@perex.cz>
Cc: <alsa-devel@alsa-project.org>, <linux-kernel@vger.kernel.org>,
<patches@opensource.cirrus.com>,
Simon Trimmer <simont@opensource.cirrus.com>,
Richard Fitzgerald <rf@opensource.cirrus.com>
Subject: [PATCH v2 02/12] ASoC: cs35l56: Make cs35l56_system_reset() code more generic
Date: Thu, 25 May 2023 17:26:08 +0100 [thread overview]
Message-ID: <20230525162618.20146-3-rf@opensource.cirrus.com> (raw)
In-Reply-To: <20230525162618.20146-1-rf@opensource.cirrus.com>
From: Simon Trimmer <simont@opensource.cirrus.com>
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 <simont@opensource.cirrus.com>
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Acked-by: Mark Brown <broonie@kernel.org>
---
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);
--
2.30.2
next prev parent reply other threads:[~2023-05-25 16:27 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-25 16:26 [PATCH v2 00/12] ALSA: hda: Adding support for CS35L56 on HDA systems Richard Fitzgerald
2023-05-25 16:26 ` [PATCH v2 01/12] ASoC: cs35l56: Move shared data into a common data structure Richard Fitzgerald
2023-05-25 16:26 ` Richard Fitzgerald [this message]
2023-05-25 16:26 ` [PATCH v2 03/12] ASoC: cs35l56: Convert utility functions to use " Richard Fitzgerald
2023-05-25 16:26 ` [PATCH v2 04/12] ASoC: cs35l56: Move utility functions to shared file Richard Fitzgerald
2023-05-25 16:26 ` [PATCH v2 05/12] ASoC: cs35l56: Move runtime suspend/resume to shared library Richard Fitzgerald
2023-05-25 16:26 ` [PATCH v2 06/12] ASoC: cs35l56: Move cs_dsp init into " Richard Fitzgerald
2023-05-25 16:26 ` [PATCH v2 07/12] ASoC: cs35l56: Move part of cs35l56_init() to " Richard Fitzgerald
2023-05-25 16:26 ` [PATCH v2 08/12] ASoC: cs35l56: Make common function for control port wait Richard Fitzgerald
2023-05-25 16:26 ` [PATCH v2 09/12] ASoC: cs35l56: Make a common function to shutdown the DSP Richard Fitzgerald
2023-05-25 16:26 ` [PATCH v2 10/12] ALSA: hda: Fix missing header dependencies Richard Fitzgerald
2023-05-25 16:26 ` [PATCH v2 11/12] ALSA: hda: Add mute_hook to hda_component Richard Fitzgerald
2023-05-25 16:26 ` [PATCH v2 12/12] ALSA: hda/cs35l56: Add driver for Cirrus Logic CS35L56 amplifier Richard Fitzgerald
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230525162618.20146-3-rf@opensource.cirrus.com \
--to=rf@opensource.cirrus.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@opensource.cirrus.com \
--cc=perex@perex.cz \
--cc=simont@opensource.cirrus.com \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox