soundwire: qcom: add support for v1.7 Soundwire Controller

This patch add support for v1.7 SoundWire Controller which has
support for Multi-EE (Execution Environment), resulting in a
new register and extending field in BUS_CTRL register.

With these updates v1.7.0 is fully supported.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20221026110210.6575-7-srinivas.kandagatla@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c
index 49e6d74..ce00a5c 100644 (file)
--- a/drivers/soundwire/qcom.c
+++ b/drivers/soundwire/qcom.c
@@ -25,6 +25,8 @@
 
 #define SWRM_COMP_SW_RESET                                     0x008
 #define SWRM_COMP_STATUS                                       0x014
+#define SWRM_LINK_MANAGER_EE                                   0x018
+#define SWRM_EE_CPU                                            1
 #define SWRM_FRM_GEN_ENABLED                                   BIT(0)
 #define SWRM_COMP_HW_VERSION                                   0x00
 #define SWRM_COMP_CFG_ADDR                                     0x04
@@ -684,7 +686,14 @@ static int qcom_swrm_init(struct qcom_swrm_ctrl *ctrl)
        u32p_replace_bits(&val, SWRM_DEF_CMD_NO_PINGS, SWRM_MCP_CFG_MAX_NUM_OF_CMD_NO_PINGS_BMSK);
        ctrl->reg_write(ctrl, SWRM_MCP_CFG_ADDR, val);
 
-       ctrl->reg_write(ctrl, SWRM_MCP_BUS_CTRL, SWRM_MCP_BUS_CLK_START);
+       if (ctrl->version >= 0x01070000) {
+               ctrl->reg_write(ctrl, SWRM_LINK_MANAGER_EE, SWRM_EE_CPU);
+               ctrl->reg_write(ctrl, SWRM_MCP_BUS_CTRL,
+                               SWRM_MCP_BUS_CLK_START << SWRM_EE_CPU);
+       } else {
+               ctrl->reg_write(ctrl, SWRM_MCP_BUS_CTRL, SWRM_MCP_BUS_CLK_START);
+       }
+
        /* Configure number of retries of a read/write cmd */
        if (ctrl->version > 0x01050001) {
                /* Only for versions >= 1.5.1 */
@@ -1509,7 +1518,13 @@ static int __maybe_unused swrm_runtime_resume(struct device *dev)
        } else {
                reset_control_reset(ctrl->audio_cgcr);
 
-               ctrl->reg_write(ctrl, SWRM_MCP_BUS_CTRL, SWRM_MCP_BUS_CLK_START);
+               if (ctrl->version >= 0x01070000) {
+                       ctrl->reg_write(ctrl, SWRM_LINK_MANAGER_EE, SWRM_EE_CPU);
+                       ctrl->reg_write(ctrl, SWRM_MCP_BUS_CTRL,
+                                       SWRM_MCP_BUS_CLK_START << SWRM_EE_CPU);
+               } else {
+                       ctrl->reg_write(ctrl, SWRM_MCP_BUS_CTRL, SWRM_MCP_BUS_CLK_START);
+               }
                ctrl->reg_write(ctrl, SWRM_INTERRUPT_CLEAR,
                        SWRM_INTERRUPT_STATUS_MASTER_CLASH_DET);
 
@@ -1573,6 +1588,7 @@ static const struct of_device_id qcom_swrm_of_match[] = {
        { .compatible = "qcom,soundwire-v1.3.0", .data = &swrm_v1_3_data },
        { .compatible = "qcom,soundwire-v1.5.1", .data = &swrm_v1_5_data },
        { .compatible = "qcom,soundwire-v1.6.0", .data = &swrm_v1_6_data },
+       { .compatible = "qcom,soundwire-v1.7.0", .data = &swrm_v1_5_data },
        {/* sentinel */},
 };