Commit 9972b90a authored by Vinod Koul's avatar Vinod Koul
Browse files

soundwire: qcom : use FIELD_{GET|PREP} 



use FIELD_{GET|PREP} in qcom driver to get/set field values instead of
open coding masks and shift operations.
Also, remove now unused register shift defines

Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
Tested-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20200903114504.1202143-6-vkoul@kernel.org


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 41ff9174

drivers/soundwire/qcom.c

+7 −15
Original line number Diff line number Diff line
@@ -43,13 +43,10 @@ 
#define SWRM_CMD_FIFO_RD_FIFO_ADDR				0x318

#define SWRM_ENUMERATOR_CFG_ADDR				0x500

#define SWRM_MCP_FRAME_CTRL_BANK_ADDR(m)		(0x101C + 0x40 * (m))

#define SWRM_MCP_FRAME_CTRL_BANK_ROW_CTRL_SHFT			3

#define SWRM_MCP_FRAME_CTRL_BANK_COL_CTRL_BMSK			GENMASK(2, 0)

#define SWRM_MCP_FRAME_CTRL_BANK_ROW_CTRL_BMSK			GENMASK(7, 3)

#define SWRM_MCP_FRAME_CTRL_BANK_COL_CTRL_SHFT			0

#define SWRM_MCP_CFG_ADDR					0x1048

#define SWRM_MCP_CFG_MAX_NUM_OF_CMD_NO_PINGS_BMSK		GENMASK(21, 17)

#define SWRM_MCP_CFG_MAX_NUM_OF_CMD_NO_PINGS_SHFT		0x11

#define SWRM_DEF_CMD_NO_PINGS					0x1f

#define SWRM_MCP_STATUS						0x104C

#define SWRM_MCP_STATUS_BANK_NUM_MASK				BIT(0)
@@ -284,8 +281,8 @@ static int qcom_swrm_init(struct qcom_swrm_ctrl *ctrl) 
	u32 val;



	/* Clear Rows and Cols */

	val = (SWRM_MAX_ROW_VAL << SWRM_MCP_FRAME_CTRL_BANK_ROW_CTRL_SHFT |

	       SWRM_MIN_COL_VAL << SWRM_MCP_FRAME_CTRL_BANK_COL_CTRL_SHFT);

	val = FIELD_PREP(SWRM_MCP_FRAME_CTRL_BANK_ROW_CTRL_BMSK, SWRM_MAX_ROW_VAL);

	val |= FIELD_PREP(SWRM_MCP_FRAME_CTRL_BANK_COL_CTRL_BMSK, SWRM_MIN_COL_VAL);



	ctrl->reg_write(ctrl, SWRM_MCP_FRAME_CTRL_BANK_ADDR(0), val);
@@ -298,9 +295,7 @@ static int qcom_swrm_init(struct qcom_swrm_ctrl *ctrl) 


	/* Configure No pings */

	ctrl->reg_read(ctrl, SWRM_MCP_CFG_ADDR, &val);

	val &= ~SWRM_MCP_CFG_MAX_NUM_OF_CMD_NO_PINGS_BMSK;

	val |= (SWRM_DEF_CMD_NO_PINGS <<

		SWRM_MCP_CFG_MAX_NUM_OF_CMD_NO_PINGS_SHFT);

	val |= FIELD_PREP(SWRM_MCP_CFG_MAX_NUM_OF_CMD_NO_PINGS_BMSK, SWRM_DEF_CMD_NO_PINGS);

	ctrl->reg_write(ctrl, SWRM_MCP_CFG_ADDR, val);



	/* Configure number of retries of a read/write cmd */
@@ -355,11 +350,8 @@ static int qcom_swrm_pre_bank_switch(struct sdw_bus *bus) 


	ctrl->reg_read(ctrl, reg, &val);



	val &= ~SWRM_MCP_FRAME_CTRL_BANK_COL_CTRL_BMSK;

	val &= ~SWRM_MCP_FRAME_CTRL_BANK_ROW_CTRL_BMSK;



	val |= (SWRM_MAX_ROW_VAL << SWRM_MCP_FRAME_CTRL_BANK_ROW_CTRL_SHFT |

		SWRM_MAX_COL_VAL << SWRM_MCP_FRAME_CTRL_BANK_COL_CTRL_SHFT);

	val |= FIELD_PREP(SWRM_MCP_FRAME_CTRL_BANK_COL_CTRL_BMSK, SWRM_MAX_COL_VAL);

	val |= FIELD_PREP(SWRM_MCP_FRAME_CTRL_BANK_ROW_CTRL_BMSK, SWRM_MAX_ROW_VAL);



	return ctrl->reg_write(ctrl, reg, val);

}
@@ -693,8 +685,8 @@ static int qcom_swrm_get_port_config(struct qcom_swrm_ctrl *ctrl) 


	ctrl->reg_read(ctrl, SWRM_COMP_PARAMS, &val);



	ctrl->num_dout_ports = val & SWRM_COMP_PARAMS_DOUT_PORTS_MASK;

	ctrl->num_din_ports = (val & SWRM_COMP_PARAMS_DIN_PORTS_MASK) >> 5;

	ctrl->num_dout_ports = FIELD_GET(SWRM_COMP_PARAMS_DOUT_PORTS_MASK, val);

	ctrl->num_din_ports = FIELD_GET(SWRM_COMP_PARAMS_DIN_PORTS_MASK, val);



	ret = of_property_read_u32(np, "qcom,din-ports", &val);

	if (ret)