soundwire: cadence: reorder MCP_CONFIG settings

Follow hardware programming flows and add placeholder comment for
multi-master mode.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200317163329.25501-12-pierre-louis.bossart@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 773341568d7e3010527e2f6f38d1784c9c778af6..9afce1f32076afeb3cdd21362e44e294707b406f 100644 (file)
--- a/drivers/soundwire/cadence_master.c
+++ b/drivers/soundwire/cadence_master.c
@@ -1097,20 +1097,22 @@ int sdw_cdns_init(struct sdw_cdns *cdns)
        /* Configure mcp config */
        val = cdns_readl(cdns, CDNS_MCP_CONFIG);
 
-       /* Set Max cmd retry to 15 */
-       val |= CDNS_MCP_CONFIG_MCMD_RETRY;
+       /* Set cmd mode for Tx and Rx cmds */
+       val &= ~CDNS_MCP_CONFIG_CMD;
 
-       /* Set frame delay between PREQ and ping frame to 15 frames */
-       val |= 0xF << SDW_REG_SHIFT(CDNS_MCP_CONFIG_MPREQ_DELAY);
+       /* Disable sniffer mode */
+       val &= ~CDNS_MCP_CONFIG_SNIFFER;
 
        /* Disable auto bus release */
        val &= ~CDNS_MCP_CONFIG_BUS_REL;
 
-       /* Disable sniffer mode */
-       val &= ~CDNS_MCP_CONFIG_SNIFFER;
+       /* Multi-master support to be added here */
 
-       /* Set cmd mode for Tx and Rx cmds */
-       val &= ~CDNS_MCP_CONFIG_CMD;
+       /* Set frame delay between PREQ and ping frame to 15 frames */
+       val |= 0xF << SDW_REG_SHIFT(CDNS_MCP_CONFIG_MPREQ_DELAY);
+
+       /* Set Max cmd retry to 15 */
+       val |= CDNS_MCP_CONFIG_MCMD_RETRY;
 
        cdns_writel(cdns, CDNS_MCP_CONFIG, val);