soundwire: intel_ace2.x: power-up first before setting SYNCPRD

The existing sequence is fine if we want to only use the xtal
clock. However if we want to select the clock, we first need to
power-up, then select the clock and last set the SYNCPRD.

This patch first modifies the order, we will add the clock selection
as a follow-up.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20240326092030.1062802-7-yung-chuan.liao@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/soundwire/intel_ace2x.c b/drivers/soundwire/intel_ace2x.c
index abdd651a185c280131ef26965a00ff4ba6a49332..d8ae05cf3d578d9ae2ffca671b38868fd178abc1 100644 (file)
--- a/drivers/soundwire/intel_ace2x.c
+++ b/drivers/soundwire/intel_ace2x.c
@@ -93,6 +93,13 @@ static int intel_link_power_up(struct sdw_intel *sdw)
 
        mutex_lock(sdw->link_res->shim_lock);
 
+       ret = hdac_bus_eml_sdw_power_up_unlocked(sdw->link_res->hbus, link_id);
+       if (ret < 0) {
+               dev_err(sdw->cdns.dev, "%s: hdac_bus_eml_sdw_power_up failed: %d\n",
+                       __func__, ret);
+               goto out;
+       }
+
        if (!*shim_mask) {
                /* we first need to program the SyncPRD/CPU registers */
                dev_dbg(sdw->cdns.dev, "first link up, programming SYNCPRD\n");
@@ -103,16 +110,7 @@ static int intel_link_power_up(struct sdw_intel *sdw)
                                __func__, ret);
                        goto out;
                }
-       }
 
-       ret = hdac_bus_eml_sdw_power_up_unlocked(sdw->link_res->hbus, link_id);
-       if (ret < 0) {
-               dev_err(sdw->cdns.dev, "%s: hdac_bus_eml_sdw_power_up failed: %d\n",
-                       __func__, ret);
-               goto out;
-       }
-
-       if (!*shim_mask) {
                /* SYNCPU will change once link is active */
                ret =  hdac_bus_eml_sdw_wait_syncpu_unlocked(sdw->link_res->hbus);
                if (ret < 0) {