ASoC: cs35l56: Remove support for A1 silicon

No product was ever released with A1 silicon so there is no
need for the driver to include support for it.

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Link: https://patch.msgid.link/20240701104444.172556-3-rf@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/cs35l56.h b/include/sound/cs35l56.h
index 2e19722989f7863414cf95f3e2ac6dfb870d9a40..642ef690ebc25fc38e4e57e91b176910eaa57cf0 100644 (file)
--- a/include/sound/cs35l56.h
+++ b/include/sound/cs35l56.h
@@ -80,9 +80,7 @@
 #define CS35L56_DSP1_AHBM_WINDOW_DEBUG_1               0x25E2044
 #define CS35L56_DSP1_XMEM_UNPACKED24_0                 0x2800000
 #define CS35L56_DSP1_FW_VER                            0x2800010
-#define CS35L56_DSP1_HALO_STATE_A1                     0x2801E58
 #define CS35L56_DSP1_HALO_STATE                                0x28021E0
-#define CS35L56_DSP1_PM_CUR_STATE_A1                   0x2804000
 #define CS35L56_DSP1_PM_CUR_STATE                      0x2804308
 #define CS35L56_DSP1_XMEM_UNPACKED24_8191              0x2807FFC
 #define CS35L56_DSP1_CORE_BASE                         0x2B80000

diff --git a/sound/soc/codecs/cs35l56-sdw.c b/sound/soc/codecs/cs35l56-sdw.c
index 70ff55c1517fe02d2a75e7d683e58edcb01947d0..8862107105ae1a20e5125e8c116a503bf5feea3d 100644 (file)
--- a/sound/soc/codecs/cs35l56-sdw.c
+++ b/sound/soc/codecs/cs35l56-sdw.c
@@ -317,79 +317,6 @@ static int cs35l56_sdw_update_status(struct sdw_slave *peripheral,
        return 0;
 }
 
-static int cs35l56_a1_kick_divider(struct cs35l56_private *cs35l56,
-                                  struct sdw_slave *peripheral)
-{
-       unsigned int curr_scale_reg, next_scale_reg;
-       int curr_scale, next_scale, ret;
-
-       if (!cs35l56->base.init_done)
-               return 0;
-
-       if (peripheral->bus->params.curr_bank) {
-               curr_scale_reg = SDW_SCP_BUSCLOCK_SCALE_B1;
-               next_scale_reg = SDW_SCP_BUSCLOCK_SCALE_B0;
-       } else {
-               curr_scale_reg = SDW_SCP_BUSCLOCK_SCALE_B0;
-               next_scale_reg = SDW_SCP_BUSCLOCK_SCALE_B1;
-       }
-
-       /*
-        * Current clock scale value must be different to new value.
-        * Modify current to guarantee this. If next still has the dummy
-        * value we wrote when it was current, the core code has not set
-        * a new scale so restore its original good value
-        */
-       curr_scale = sdw_read_no_pm(peripheral, curr_scale_reg);
-       if (curr_scale < 0) {
-               dev_err(cs35l56->base.dev, "Failed to read current clock scale: %d\n", curr_scale);
-               return curr_scale;
-       }
-
-       next_scale = sdw_read_no_pm(peripheral, next_scale_reg);
-       if (next_scale < 0) {
-               dev_err(cs35l56->base.dev, "Failed to read next clock scale: %d\n", next_scale);
-               return next_scale;
-       }
-
-       if (next_scale == CS35L56_SDW_INVALID_BUS_SCALE) {
-               next_scale = cs35l56->old_sdw_clock_scale;
-               ret = sdw_write_no_pm(peripheral, next_scale_reg, next_scale);
-               if (ret < 0) {
-                       dev_err(cs35l56->base.dev, "Failed to modify current clock scale: %d\n",
-                               ret);
-                       return ret;
-               }
-       }
-
-       cs35l56->old_sdw_clock_scale = curr_scale;
-       ret = sdw_write_no_pm(peripheral, curr_scale_reg, CS35L56_SDW_INVALID_BUS_SCALE);
-       if (ret < 0) {
-               dev_err(cs35l56->base.dev, "Failed to modify current clock scale: %d\n", ret);
-               return ret;
-       }
-
-       dev_dbg(cs35l56->base.dev, "Next bus scale: %#x\n", next_scale);
-
-       return 0;
-}
-
-static int cs35l56_sdw_bus_config(struct sdw_slave *peripheral,
-                                 struct sdw_bus_params *params)
-{
-       struct cs35l56_private *cs35l56 = dev_get_drvdata(&peripheral->dev);
-       int sclk;
-
-       sclk = params->curr_dr_freq / 2;
-       dev_dbg(cs35l56->base.dev, "%s: sclk=%u c=%u r=%u\n",
-               __func__, sclk, params->col, params->row);
-
-       if ((cs35l56->base.type == 0x56) && (cs35l56->base.rev < 0xb0))
-               return cs35l56_a1_kick_divider(cs35l56, peripheral);
-
-       return 0;
-}
-
 static int __maybe_unused cs35l56_sdw_clk_stop(struct sdw_slave *peripheral,
                                               enum sdw_clk_stop_mode mode,
                                               enum sdw_clk_stop_type type)
@@ -405,7 +332,6 @@ static const struct sdw_slave_ops cs35l56_sdw_ops = {
        .read_prop = cs35l56_sdw_read_prop,
        .interrupt_callback = cs35l56_sdw_interrupt,
        .update_status = cs35l56_sdw_update_status,
-       .bus_config = cs35l56_sdw_bus_config,
 #ifdef DEBUG
        .clk_stop = cs35l56_sdw_clk_stop,
 #endif

diff --git a/sound/soc/codecs/cs35l56-shared.c b/sound/soc/codecs/cs35l56-shared.c
index 035d7c3c4683d45c7500067cab516e7bd511fb1f..e7e8d617da94e4931062f00db7bd386f14694ddf 100644 (file)
--- a/sound/soc/codecs/cs35l56-shared.c
+++ b/sound/soc/codecs/cs35l56-shared.c
@@ -245,19 +245,13 @@ EXPORT_SYMBOL_NS_GPL(cs35l56_mbox_send, SND_SOC_CS35L56_SHARED);
 int cs35l56_firmware_shutdown(struct cs35l56_base *cs35l56_base)
 {
        int ret;
-       unsigned int reg;
        unsigned int val;
 
        ret = cs35l56_mbox_send(cs35l56_base, CS35L56_MBOX_CMD_SHUTDOWN);
        if (ret)
                return ret;
 
-       if (cs35l56_base->rev < CS35L56_REVID_B0)
-               reg = CS35L56_DSP1_PM_CUR_STATE_A1;
-       else
-               reg = CS35L56_DSP1_PM_CUR_STATE;
-
-       ret = regmap_read_poll_timeout(cs35l56_base->regmap,  reg,
+       ret = regmap_read_poll_timeout(cs35l56_base->regmap,  CS35L56_DSP1_PM_CUR_STATE,
                                       val, (val == CS35L56_HALO_STATE_SHUTDOWN),
                                       CS35L56_HALO_STATE_POLL_US,
                                       CS35L56_HALO_STATE_TIMEOUT_US);
@@ -270,15 +264,9 @@ 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;
        unsigned int val = 0;
        int read_ret, poll_ret;
 
-       if (cs35l56_base->rev < CS35L56_REVID_B0)
-               reg = CS35L56_DSP1_HALO_STATE_A1;
-       else
-               reg = CS35L56_DSP1_HALO_STATE;
-
        /*
         * The regmap must remain in cache-only until the chip has
         * booted, so use a bypassed read of the status register.
@@ -288,7 +276,7 @@ int cs35l56_wait_for_firmware_boot(struct cs35l56_base *cs35l56_base)
                                     CS35L56_HALO_STATE_POLL_US,
                                     CS35L56_HALO_STATE_TIMEOUT_US,
                                     false,
-                                    cs35l56_base->regmap, reg, &val);
+                                    cs35l56_base->regmap, CS35L56_DSP1_HALO_STATE, &val);
 
        if (poll_ret) {
                dev_err(cs35l56_base->dev, "Firmware boot timed out(%d): HALO_STATE=%#x\n",
@@ -726,11 +714,6 @@ int cs35l56_hw_init(struct cs35l56_base *cs35l56_base)
        else
                cs35l56_wait_control_port_ready();
 
-       /*
-        * The HALO_STATE register is in different locations on Ax and B0
-        * devices so the REVID needs to be determined before waiting for the
-        * firmware to boot.
-        */
        ret = regmap_read_bypassed(cs35l56_base->regmap, CS35L56_REVID, &revid);
        if (ret < 0) {
                dev_err(cs35l56_base->dev, "Get Revision ID failed\n");

diff --git a/sound/soc/codecs/cs35l56.h b/sound/soc/codecs/cs35l56.h
index 200f695efca3d2c90dabefa05395bb2d7a394efc..8a987ec01507ec3a5b53c2a914303004e6d68282 100644 (file)
--- a/sound/soc/codecs/cs35l56.h
+++ b/sound/soc/codecs/cs35l56.h
@@ -51,7 +51,6 @@ struct cs35l56_private {
        u8 asp_slot_count;
        bool tdm_mode;
        bool sysclk_set;
-       u8 old_sdw_clock_scale;
 };
 
 extern const struct dev_pm_ops cs35l56_pm_ops_i2c_spi;