soundwire: cadence: add soft-reset on startup

Follow the recommended programming flows.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20241003094830.119673-2-yung-chuan.liao@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c
index 05652e983539b47d6cab7be2ead6a609255bd3d5..7c8c977a923ad672b4b7852fb4afa0ab908c2bde 100644 (file)
--- a/drivers/soundwire/cadence_master.c
+++ b/drivers/soundwire/cadence_master.c
@@ -1377,6 +1377,31 @@ static void cdns_init_clock_ctrl(struct sdw_cdns *cdns)
        cdns_writel(cdns, CDNS_MCP_SSP_CTRL1, ssp_interval);
 }
 
+/**
+ * sdw_cdns_soft_reset() - Cadence soft-reset
+ * @cdns: Cadence instance
+ */
+int sdw_cdns_soft_reset(struct sdw_cdns *cdns)
+{
+       int ret;
+
+       cdns_updatel(cdns, CDNS_MCP_CONTROL, CDNS_MCP_CONTROL_SOFT_RST,
+                    CDNS_MCP_CONTROL_SOFT_RST);
+
+       ret = cdns_config_update(cdns);
+       if (ret < 0) {
+               dev_err(cdns->dev, "%s: config update failed\n", __func__);
+               return ret;
+       }
+
+       ret = cdns_set_wait(cdns, CDNS_MCP_CONTROL, CDNS_MCP_CONTROL_SOFT_RST, 0);
+       if (ret < 0)
+               dev_err(cdns->dev, "%s: Soft Reset timed out\n", __func__);
+
+       return ret;
+}
+EXPORT_SYMBOL(sdw_cdns_soft_reset);
+
 /**
  * sdw_cdns_init() - Cadence initialization
  * @cdns: Cadence instance

diff --git a/drivers/soundwire/cadence_master.h b/drivers/soundwire/cadence_master.h
index e1d7969ba48ae845e10a47df2975142073062230..c34fb050fe4f0e9974577c7667733c9b693c73c2 100644 (file)
--- a/drivers/soundwire/cadence_master.h
+++ b/drivers/soundwire/cadence_master.h
@@ -168,6 +168,7 @@ int sdw_cdns_probe(struct sdw_cdns *cdns);
 irqreturn_t sdw_cdns_irq(int irq, void *dev_id);
 irqreturn_t sdw_cdns_thread(int irq, void *dev_id);
 
+int sdw_cdns_soft_reset(struct sdw_cdns *cdns);
 int sdw_cdns_init(struct sdw_cdns *cdns);
 int sdw_cdns_pdi_init(struct sdw_cdns *cdns,
                      struct sdw_cdns_stream_config config);

diff --git a/drivers/soundwire/intel_bus_common.c b/drivers/soundwire/intel_bus_common.c
index d3ff6c65b64c33004b6cac0c6c993645d626d2ff..ad1f8ebdbfc9b1fba52f332a4082a7b7dce22ea0 100644 (file)
--- a/drivers/soundwire/intel_bus_common.c
+++ b/drivers/soundwire/intel_bus_common.c
@@ -16,6 +16,12 @@ int intel_start_bus(struct sdw_intel *sdw)
        struct sdw_bus *bus = &cdns->bus;
        int ret;
 
+       ret = sdw_cdns_soft_reset(cdns);
+       if (ret < 0) {
+               dev_err(dev, "%s: unable to soft-reset Cadence IP: %d\n", __func__, ret);
+               return ret;
+       }
+
        /*
         * follow recommended programming flows to avoid timeouts when
         * gsync is enabled