On 09-09-20, 17:09, Srinivas Kandagatla wrote:
> currently the max rows and cols values are hardcoded. In reality
> these values depend on the IP version. So get these based on
> device tree compatible strings.
>
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@xxxxxxxxxx>
> ---
> drivers/soundwire/qcom.c | 46 +++++++++++++++++++++++++++-------------
> 1 file changed, 31 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c
> index 1ec0ee931f5b..03c5bc05fc6e 100644
> --- a/drivers/soundwire/qcom.c
> +++ b/drivers/soundwire/qcom.c
> @@ -69,11 +69,6 @@
> #define SWRM_REG_VAL_PACK(data, dev, id, reg) \
> ((reg) | ((id) << 16) | ((dev) << 20) | ((data) << 24))
>
> -#define SWRM_MAX_ROW_VAL 0 /* Rows = 48 */
> -#define SWRM_DEFAULT_ROWS 48
> -#define SWRM_MIN_COL_VAL 0 /* Cols = 2 */
> -#define SWRM_DEFAULT_COL 16
> -#define SWRM_MAX_COL_VAL 7
> #define SWRM_SPECIAL_CMD_ID 0xF
> #define MAX_FREQ_NUM 1
> #define TIMEOUT_MS (2 * HZ)
> @@ -107,6 +102,8 @@ struct qcom_swrm_ctrl {
> unsigned int version;
> int num_din_ports;
> int num_dout_ports;
> + int cols_index;
> + int rows_index;
> unsigned long dout_port_mask;
> unsigned long din_port_mask;
> struct qcom_swrm_port_config pconfig[QCOM_SDW_MAX_PORTS];
> @@ -116,6 +113,21 @@ struct qcom_swrm_ctrl {
> int (*reg_write)(struct qcom_swrm_ctrl *ctrl, int reg, int val);
> };
>
> +struct qcom_swrm_data {
> + int default_cols;
> + int default_rows;
unsigned int for these?
> +};
> +
> +static struct qcom_swrm_data swrm_v1_3_data = {
> + .default_rows = 48,
> + .default_cols = 16,
> +};
> +
> +static struct qcom_swrm_data swrm_v1_5_data = {
> + .default_rows = 50,
> + .default_cols = 16,
> +};
> +
> #define to_qcom_sdw(b) container_of(b, struct qcom_swrm_ctrl, bus)
>
> static int qcom_swrm_ahb_reg_read(struct qcom_swrm_ctrl *ctrl, int reg,
> @@ -302,8 +314,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 = ctrl->rows_index << SWRM_MCP_FRAME_CTRL_BANK_ROW_CTRL_SHFT |
> + ctrl->cols_index << SWRM_MCP_FRAME_CTRL_BANK_COL_CTRL_SHFT;
use FIELD_{GET|SET} / u32_encode_bits for these
Please rebase on sdw-next, this has already been updated in next
>
> ctrl->reg_write(ctrl, SWRM_MCP_FRAME_CTRL_BANK_ADDR(0), val);
>
> @@ -382,8 +394,8 @@ static int qcom_swrm_pre_bank_switch(struct sdw_bus *bus)
> 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 |= ctrl->rows_index << SWRM_MCP_FRAME_CTRL_BANK_ROW_CTRL_SHFT |
> + ctrl->cols_index << SWRM_MCP_FRAME_CTRL_BANK_COL_CTRL_SHFT;
>
> return ctrl->reg_write(ctrl, reg, val);
> }
> @@ -784,6 +796,7 @@ static int qcom_swrm_probe(struct platform_device *pdev)
> struct sdw_master_prop *prop;
> struct sdw_bus_params *params;
> struct qcom_swrm_ctrl *ctrl;
> + const struct qcom_swrm_data *data;
> struct resource *res;
> int ret;
> u32 val;
> @@ -792,6 +805,9 @@ static int qcom_swrm_probe(struct platform_device *pdev)
> if (!ctrl)
> return -ENOMEM;
>
> + data = of_device_get_match_data(dev);
how about checking data is valid?
> + ctrl->rows_index = sdw_find_row_index(data->default_rows);
> + ctrl->cols_index = sdw_find_col_index(data->default_cols);
> #ifdef CONFIG_SLIMBUS
> if (dev->parent->bus == &slimbus_bus) {
> #else
> @@ -844,8 +860,8 @@ static int qcom_swrm_probe(struct platform_device *pdev)
> params = &ctrl->bus.params;
> params->max_dr_freq = DEFAULT_CLK_FREQ;
> params->curr_dr_freq = DEFAULT_CLK_FREQ;
> - params->col = SWRM_DEFAULT_COL;
> - params->row = SWRM_DEFAULT_ROWS;
> + params->col = data->default_cols;
> + params->row = data->default_rows;
> ctrl->reg_read(ctrl, SWRM_MCP_STATUS, &val);
> params->curr_bank = val & SWRM_MCP_STATUS_BANK_NUM_MASK;
> params->next_bank = !params->curr_bank;
> @@ -855,8 +871,8 @@ static int qcom_swrm_probe(struct platform_device *pdev)
> prop->num_clk_gears = 0;
> prop->num_clk_freq = MAX_FREQ_NUM;
> prop->clk_freq = &qcom_swrm_freq_tbl[0];
> - prop->default_col = SWRM_DEFAULT_COL;
> - prop->default_row = SWRM_DEFAULT_ROWS;
> + prop->default_col = data->default_cols;
> + prop->default_row = data->default_rows;
>
> ctrl->reg_read(ctrl, SWRM_COMP_HW_VERSION, &ctrl->version);
>
> @@ -907,8 +923,8 @@ static int qcom_swrm_remove(struct platform_device *pdev)
> }
>
> static const struct of_device_id qcom_swrm_of_match[] = {
> - { .compatible = "qcom,soundwire-v1.3.0", },
> - { .compatible = "qcom,soundwire-v1.5.1", },
> + { .compatible = "qcom,soundwire-v1.3.0", .data = &swrm_v1_3_data },
> + { .compatible = "qcom,soundwire-v1.5.1", .data = &swrm_v1_5_data },
> {/* sentinel */},
> };
>
> --
> 2.21.0
--
~Vinod
