Commit 208a03ee authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Vinod Koul

soundwire: qcom: define hardcoded version magic numbers

Use a define instead of hard-coded register values for Soundwire
hardware version number, because it is a bit easier to read and allows
to drop explaining comment.
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20230222144412.237832-1-krzysztof.kozlowski@linaro.orgSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent bd934f77
...@@ -28,6 +28,9 @@ ...@@ -28,6 +28,9 @@
#define SWRM_LINK_MANAGER_EE 0x018 #define SWRM_LINK_MANAGER_EE 0x018
#define SWRM_EE_CPU 1 #define SWRM_EE_CPU 1
#define SWRM_FRM_GEN_ENABLED BIT(0) #define SWRM_FRM_GEN_ENABLED BIT(0)
#define SWRM_VERSION_1_3_0 0x01030000
#define SWRM_VERSION_1_5_1 0x01050001
#define SWRM_VERSION_1_7_0 0x01070000
#define SWRM_COMP_HW_VERSION 0x00 #define SWRM_COMP_HW_VERSION 0x00
#define SWRM_COMP_CFG_ADDR 0x04 #define SWRM_COMP_CFG_ADDR 0x04
#define SWRM_COMP_CFG_IRQ_LEVEL_OR_PULSE_MSK BIT(1) #define SWRM_COMP_CFG_IRQ_LEVEL_OR_PULSE_MSK BIT(1)
...@@ -351,8 +354,7 @@ static int qcom_swrm_cmd_fifo_wr_cmd(struct qcom_swrm_ctrl *swrm, u8 cmd_data, ...@@ -351,8 +354,7 @@ static int qcom_swrm_cmd_fifo_wr_cmd(struct qcom_swrm_ctrl *swrm, u8 cmd_data,
/* Its assumed that write is okay as we do not get any status back */ /* Its assumed that write is okay as we do not get any status back */
swrm->reg_write(swrm, SWRM_CMD_FIFO_WR_CMD, val); swrm->reg_write(swrm, SWRM_CMD_FIFO_WR_CMD, val);
/* version 1.3 or less */ if (swrm->version <= SWRM_VERSION_1_3_0)
if (swrm->version <= 0x01030000)
usleep_range(150, 155); usleep_range(150, 155);
if (cmd_id == SWR_BROADCAST_CMD_ID) { if (cmd_id == SWR_BROADCAST_CMD_ID) {
...@@ -695,7 +697,7 @@ static int qcom_swrm_init(struct qcom_swrm_ctrl *ctrl) ...@@ -695,7 +697,7 @@ 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); 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_CFG_ADDR, val);
if (ctrl->version >= 0x01070000) { if (ctrl->version >= SWRM_VERSION_1_7_0) {
ctrl->reg_write(ctrl, SWRM_LINK_MANAGER_EE, SWRM_EE_CPU); ctrl->reg_write(ctrl, SWRM_LINK_MANAGER_EE, SWRM_EE_CPU);
ctrl->reg_write(ctrl, SWRM_MCP_BUS_CTRL, ctrl->reg_write(ctrl, SWRM_MCP_BUS_CTRL,
SWRM_MCP_BUS_CLK_START << SWRM_EE_CPU); SWRM_MCP_BUS_CLK_START << SWRM_EE_CPU);
...@@ -704,8 +706,7 @@ static int qcom_swrm_init(struct qcom_swrm_ctrl *ctrl) ...@@ -704,8 +706,7 @@ static int qcom_swrm_init(struct qcom_swrm_ctrl *ctrl)
} }
/* Configure number of retries of a read/write cmd */ /* Configure number of retries of a read/write cmd */
if (ctrl->version >= 0x01050001) { if (ctrl->version >= SWRM_VERSION_1_5_1) {
/* Only for versions >= 1.5.1 */
ctrl->reg_write(ctrl, SWRM_CMD_FIFO_CFG_ADDR, ctrl->reg_write(ctrl, SWRM_CMD_FIFO_CFG_ADDR,
SWRM_RD_WR_CMD_RETRIES | SWRM_RD_WR_CMD_RETRIES |
SWRM_CONTINUE_EXEC_ON_CMD_IGNORE); SWRM_CONTINUE_EXEC_ON_CMD_IGNORE);
...@@ -1239,7 +1240,7 @@ static int qcom_swrm_get_port_config(struct qcom_swrm_ctrl *ctrl) ...@@ -1239,7 +1240,7 @@ static int qcom_swrm_get_port_config(struct qcom_swrm_ctrl *ctrl)
ret = of_property_read_u8_array(np, "qcom,ports-block-pack-mode", ret = of_property_read_u8_array(np, "qcom,ports-block-pack-mode",
bp_mode, nports); bp_mode, nports);
if (ret) { if (ret) {
if (ctrl->version <= 0x01030000) if (ctrl->version <= SWRM_VERSION_1_3_0)
memset(bp_mode, SWR_INVALID_PARAM, QCOM_SDW_MAX_PORTS); memset(bp_mode, SWR_INVALID_PARAM, QCOM_SDW_MAX_PORTS);
else else
return ret; return ret;
...@@ -1442,7 +1443,7 @@ static int qcom_swrm_probe(struct platform_device *pdev) ...@@ -1442,7 +1443,7 @@ static int qcom_swrm_probe(struct platform_device *pdev)
pm_runtime_enable(dev); pm_runtime_enable(dev);
/* Clk stop is not supported on WSA Soundwire masters */ /* Clk stop is not supported on WSA Soundwire masters */
if (ctrl->version <= 0x01030000) { if (ctrl->version <= SWRM_VERSION_1_3_0) {
ctrl->clock_stop_not_supported = true; ctrl->clock_stop_not_supported = true;
} else { } else {
ctrl->reg_read(ctrl, SWRM_COMP_MASTER_ID, &val); ctrl->reg_read(ctrl, SWRM_COMP_MASTER_ID, &val);
...@@ -1527,7 +1528,7 @@ static int __maybe_unused swrm_runtime_resume(struct device *dev) ...@@ -1527,7 +1528,7 @@ static int __maybe_unused swrm_runtime_resume(struct device *dev)
} else { } else {
reset_control_reset(ctrl->audio_cgcr); reset_control_reset(ctrl->audio_cgcr);
if (ctrl->version >= 0x01070000) { if (ctrl->version >= SWRM_VERSION_1_7_0) {
ctrl->reg_write(ctrl, SWRM_LINK_MANAGER_EE, SWRM_EE_CPU); ctrl->reg_write(ctrl, SWRM_LINK_MANAGER_EE, SWRM_EE_CPU);
ctrl->reg_write(ctrl, SWRM_MCP_BUS_CTRL, ctrl->reg_write(ctrl, SWRM_MCP_BUS_CTRL,
SWRM_MCP_BUS_CLK_START << SWRM_EE_CPU); SWRM_MCP_BUS_CLK_START << SWRM_EE_CPU);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment