From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> To: vkoul@kernel.org Cc: yung-chuan.liao@linux.intel.com, pierre-louis.bossart@linux.intel.com, sanyog.r.kale@intel.com, linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Subject: [PATCH 2/6] soundwire: qcom: extract version field Date: Fri, 29 Jan 2021 17:32:44 +0000 [thread overview] Message-ID: <20210129173248.5941-3-srinivas.kandagatla@linaro.org> (raw) In-Reply-To: <20210129173248.5941-1-srinivas.kandagatla@linaro.org> Extract version field to major, minor and step, so that we can add dynamic version checks to read/writes. This will help for controller versions that need specific bits to be programmed. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --- drivers/soundwire/qcom.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index 36e273795cbe..da6e0d4e9622 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -110,7 +110,9 @@ struct qcom_swrm_ctrl { u8 wr_cmd_id; u8 rd_cmd_id; int irq; - unsigned int version; + u8 version_major; + u8 version_minor; + u8 version_step; int num_din_ports; int num_dout_ports; int cols_index; @@ -961,7 +963,7 @@ static int qcom_swrm_probe(struct platform_device *pdev) prop->default_col = data->default_cols; prop->default_row = data->default_rows; - ctrl->reg_read(ctrl, SWRM_COMP_HW_VERSION, &ctrl->version); + ctrl->reg_read(ctrl, SWRM_COMP_HW_VERSION, &val); ret = devm_request_threaded_irq(dev, ctrl->irq, NULL, qcom_swrm_irq_handler, @@ -985,9 +987,11 @@ static int qcom_swrm_probe(struct platform_device *pdev) if (ret) goto err_master_add; + ctrl->version_major = (val >> 24) & 0xff; + ctrl->version_minor = (val >> 16) & 0xff; + ctrl->version_step = val & 0xffff; dev_info(dev, "Qualcomm Soundwire controller v%x.%x.%x Registered\n", - (ctrl->version >> 24) & 0xff, (ctrl->version >> 16) & 0xff, - ctrl->version & 0xffff); + ctrl->version_major, ctrl->version_minor, ctrl->version_step); return 0; -- 2.21.0
WARNING: multiple messages have this Message-ID (diff)
From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> To: vkoul@kernel.org Cc: alsa-devel@alsa-project.org, pierre-louis.bossart@linux.intel.com, linux-kernel@vger.kernel.org, Srinivas Kandagatla <srinivas.kandagatla@linaro.org>, sanyog.r.kale@intel.com, yung-chuan.liao@linux.intel.com Subject: [PATCH 2/6] soundwire: qcom: extract version field Date: Fri, 29 Jan 2021 17:32:44 +0000 [thread overview] Message-ID: <20210129173248.5941-3-srinivas.kandagatla@linaro.org> (raw) In-Reply-To: <20210129173248.5941-1-srinivas.kandagatla@linaro.org> Extract version field to major, minor and step, so that we can add dynamic version checks to read/writes. This will help for controller versions that need specific bits to be programmed. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --- drivers/soundwire/qcom.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index 36e273795cbe..da6e0d4e9622 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -110,7 +110,9 @@ struct qcom_swrm_ctrl { u8 wr_cmd_id; u8 rd_cmd_id; int irq; - unsigned int version; + u8 version_major; + u8 version_minor; + u8 version_step; int num_din_ports; int num_dout_ports; int cols_index; @@ -961,7 +963,7 @@ static int qcom_swrm_probe(struct platform_device *pdev) prop->default_col = data->default_cols; prop->default_row = data->default_rows; - ctrl->reg_read(ctrl, SWRM_COMP_HW_VERSION, &ctrl->version); + ctrl->reg_read(ctrl, SWRM_COMP_HW_VERSION, &val); ret = devm_request_threaded_irq(dev, ctrl->irq, NULL, qcom_swrm_irq_handler, @@ -985,9 +987,11 @@ static int qcom_swrm_probe(struct platform_device *pdev) if (ret) goto err_master_add; + ctrl->version_major = (val >> 24) & 0xff; + ctrl->version_minor = (val >> 16) & 0xff; + ctrl->version_step = val & 0xffff; dev_info(dev, "Qualcomm Soundwire controller v%x.%x.%x Registered\n", - (ctrl->version >> 24) & 0xff, (ctrl->version >> 16) & 0xff, - ctrl->version & 0xffff); + ctrl->version_major, ctrl->version_minor, ctrl->version_step); return 0; -- 2.21.0
next prev parent reply other threads:[~2021-01-29 17:37 UTC|newest] Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-29 17:32 [PATCH 0/6] soundwire: qcom: various improvements Srinivas Kandagatla 2021-01-29 17:32 ` Srinivas Kandagatla 2021-01-29 17:32 ` [PATCH 1/6] soundwire: qcom: add support to missing transport params Srinivas Kandagatla 2021-01-29 17:32 ` Srinivas Kandagatla 2021-01-29 19:20 ` Pierre-Louis Bossart 2021-01-29 19:20 ` Pierre-Louis Bossart 2021-02-01 15:50 ` Srinivas Kandagatla 2021-02-01 15:50 ` Srinivas Kandagatla 2021-02-01 16:33 ` Pierre-Louis Bossart 2021-02-01 16:33 ` Pierre-Louis Bossart 2021-02-01 14:13 ` Vinod Koul 2021-02-01 14:13 ` Vinod Koul 2021-02-01 15:50 ` Srinivas Kandagatla 2021-02-01 15:50 ` Srinivas Kandagatla 2021-01-29 17:32 ` Srinivas Kandagatla [this message] 2021-01-29 17:32 ` [PATCH 2/6] soundwire: qcom: extract version field Srinivas Kandagatla 2021-01-29 17:32 ` [PATCH 3/6] soundwire: qcom: set continue execution flag for ignored commands Srinivas Kandagatla 2021-01-29 17:32 ` Srinivas Kandagatla 2021-01-29 19:21 ` Pierre-Louis Bossart 2021-01-29 19:21 ` Pierre-Louis Bossart 2021-02-01 14:16 ` Vinod Koul 2021-02-01 14:16 ` Vinod Koul 2021-02-01 15:50 ` Srinivas Kandagatla 2021-02-01 15:50 ` Srinivas Kandagatla 2021-02-02 4:46 ` Vinod Koul 2021-02-02 4:46 ` Vinod Koul 2021-01-29 17:32 ` [PATCH 4/6] soundwire: qcom: start the clock during initialization Srinivas Kandagatla 2021-01-29 17:32 ` Srinivas Kandagatla 2021-02-01 14:21 ` Vinod Koul 2021-02-01 14:21 ` Vinod Koul 2021-02-01 15:50 ` Srinivas Kandagatla 2021-02-01 15:50 ` Srinivas Kandagatla 2021-02-02 4:46 ` Vinod Koul 2021-02-02 4:46 ` Vinod Koul 2021-01-29 17:32 ` [PATCH 5/6] soundwire: qcom: update register read/write routine Srinivas Kandagatla 2021-01-29 17:32 ` Srinivas Kandagatla 2021-01-29 19:33 ` Pierre-Louis Bossart 2021-01-29 19:33 ` Pierre-Louis Bossart 2021-02-01 15:50 ` Srinivas Kandagatla 2021-02-01 15:50 ` Srinivas Kandagatla 2021-02-01 16:42 ` Pierre-Louis Bossart 2021-02-01 16:42 ` Pierre-Louis Bossart 2021-02-02 10:19 ` Srinivas Kandagatla 2021-02-02 10:19 ` Srinivas Kandagatla 2021-02-02 16:58 ` Pierre-Louis Bossart 2021-02-02 16:58 ` Pierre-Louis Bossart 2021-02-01 14:26 ` Vinod Koul 2021-02-01 14:26 ` Vinod Koul 2021-02-01 15:50 ` Srinivas Kandagatla 2021-02-01 15:50 ` Srinivas Kandagatla 2021-01-29 17:32 ` [PATCH 6/6] soundwire: qcom: add support to new interrupts Srinivas Kandagatla 2021-01-29 17:32 ` Srinivas Kandagatla 2021-01-29 19:38 ` Pierre-Louis Bossart 2021-01-29 19:38 ` Pierre-Louis Bossart 2021-02-01 15:51 ` Srinivas Kandagatla 2021-02-01 15:51 ` Srinivas Kandagatla 2021-02-01 14:31 ` Vinod Koul 2021-02-01 14:31 ` Vinod Koul 2021-02-01 15:51 ` Srinivas Kandagatla 2021-02-01 15:51 ` Srinivas Kandagatla
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210129173248.5941-3-srinivas.kandagatla@linaro.org \ --to=srinivas.kandagatla@linaro.org \ --cc=alsa-devel@alsa-project.org \ --cc=linux-kernel@vger.kernel.org \ --cc=pierre-louis.bossart@linux.intel.com \ --cc=sanyog.r.kale@intel.com \ --cc=vkoul@kernel.org \ --cc=yung-chuan.liao@linux.intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.