version 1.5.1 and higher IPs of this controller required to set
continue execution on ingored command flag. This patch sets this flag.

Signed-off-by: Srinivas Kandagatla <srinivas.kandaga...@linaro.org>
---
 drivers/soundwire/qcom.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c
index da6e0d4e9622..3669bac11a32 100644
--- a/drivers/soundwire/qcom.c
+++ b/drivers/soundwire/qcom.c
@@ -40,6 +40,7 @@
 #define SWRM_CMD_FIFO_CMD                                      0x308
 #define SWRM_CMD_FIFO_STATUS                                   0x30C
 #define SWRM_CMD_FIFO_CFG_ADDR                                 0x314
+#define SWRM_CONTINUE_EXEC_ON_CMD_IGNORE                       BIT(31)
 #define SWRM_RD_WR_CMD_RETRIES                                 0x7
 #define SWRM_CMD_FIFO_RD_FIFO_ADDR                             0x318
 #define SWRM_ENUMERATOR_CFG_ADDR                               0x500
@@ -345,7 +346,16 @@ static int qcom_swrm_init(struct qcom_swrm_ctrl *ctrl)
        ctrl->reg_write(ctrl, SWRM_MCP_CFG_ADDR, val);
 
        /* Configure number of retries of a read/write cmd */
-       ctrl->reg_write(ctrl, SWRM_CMD_FIFO_CFG_ADDR, SWRM_RD_WR_CMD_RETRIES);
+       if (ctrl->version_major == 1 && ctrl->version_minor >= 5 &&
+           ctrl->version_step >= 1) {
+               /* Only for versions >= 1.5.1 */
+               ctrl->reg_write(ctrl, SWRM_CMD_FIFO_CFG_ADDR,
+                               SWRM_RD_WR_CMD_RETRIES |
+                               SWRM_CONTINUE_EXEC_ON_CMD_IGNORE);
+       } else {
+               ctrl->reg_write(ctrl, SWRM_CMD_FIFO_CFG_ADDR,
+                               SWRM_RD_WR_CMD_RETRIES);
+       }
 
        /* Set IRQ to PULSE */
        ctrl->reg_write(ctrl, SWRM_COMP_CFG_ADDR,
-- 
2.21.0

Reply via email to