ASoC: cs35l56: Allow a wider range for reset pulse width

There is no reason to have such a tight usleep range of 400us and it is
acceptable to allow MIN_US * 2.

Also wrap the usleep in an inline function.

Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/168147949455.26.3401634900657387799@mailman-core.alsa-project.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/cs35l56.c b/sound/soc/codecs/cs35l56.c
index 5ea7f41..d600951 100644 (file)
--- a/sound/soc/codecs/cs35l56.c
+++ b/sound/soc/codecs/cs35l56.c
@@ -835,6 +835,12 @@ static int cs35l56_wait_for_firmware_boot(struct cs35l56_private *cs35l56)
        return 0;
 }
 
+static inline void cs35l56_wait_min_reset_pulse(void)
+{
+       /* Satisfy minimum reset pulse width spec */
+       usleep_range(CS35L56_RESET_PULSE_MIN_US, 2 * CS35L56_RESET_PULSE_MIN_US);
+}
+
 static const struct reg_sequence cs35l56_system_reset_seq[] = {
        REG_SEQ0(CS35L56_DSP_VIRTUAL1_MBOX_1, CS35L56_MBOX_CMD_SYSTEM_RESET),
 };
@@ -1236,7 +1242,7 @@ int cs35l56_system_suspend_late(struct device *dev)
         */
        if (cs35l56->reset_gpio) {
                gpiod_set_value_cansleep(cs35l56->reset_gpio, 0);
-               usleep_range(CS35L56_RESET_PULSE_MIN_US, CS35L56_RESET_PULSE_MIN_US + 400);
+               cs35l56_wait_min_reset_pulse();
        }
 
        regulator_bulk_disable(ARRAY_SIZE(cs35l56->supplies), cs35l56->supplies);
@@ -1289,7 +1295,7 @@ int cs35l56_system_resume_early(struct device *dev)
        /* Ensure a spec-compliant RESET pulse. */
        if (cs35l56->reset_gpio) {
                gpiod_set_value_cansleep(cs35l56->reset_gpio, 0);
-               usleep_range(CS35L56_RESET_PULSE_MIN_US, CS35L56_RESET_PULSE_MIN_US + 400);
+               cs35l56_wait_min_reset_pulse();
        }
 
        /* Enable supplies before releasing RESET. */
@@ -1440,9 +1446,7 @@ int cs35l56_common_probe(struct cs35l56_private *cs35l56)
                return dev_err_probe(cs35l56->dev, ret, "Failed to enable supplies\n");
 
        if (cs35l56->reset_gpio) {
-               /* satisfy minimum reset pulse width spec */
-               usleep_range(CS35L56_RESET_PULSE_MIN_US,
-                            CS35L56_RESET_PULSE_MIN_US + 400);
+               cs35l56_wait_min_reset_pulse();
                gpiod_set_value_cansleep(cs35l56->reset_gpio, 1);
        }