ASoC: cs35l56: Make cs35l56_system_reset() code more generic

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>
Link: https://lore.kernel.org/r/20230721132120.5523-3-rf@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/cs35l56.c b/sound/soc/codecs/cs35l56.c
index 4eb8e5b09bfdf3e79eb5710c8b53d134dccdb7b0..7a83e388e8696e0c14a2b0367a357f9357d441df 100644 (file)
--- a/sound/soc/codecs/cs35l56.c
+++ b/sound/soc/codecs/cs35l56.c
@@ -802,10 +802,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.
@@ -816,7 +814,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);
@@ -883,7 +881,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) {
                /*
@@ -1547,7 +1546,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);