| Message ID | 20230728112848.67092-1-krzysztof.kozlowski@linaro.org |
|---|---|
| State | Accepted |
| Commit | 5d78c7d684192e42241593a936ee60003d8ac064 |
| Headers | show |
| Series | [1/2] soundwire: qcom: use newer link status tregister on v2.0.0 | expand |
On Fri, 28 Jul 2023 13:28:47 +0200, Krzysztof Kozlowski wrote: > Soundwire v2.0.0 comes with a new register LINK_STATUS for the > FRAME_GEN_ENABLED field (bit indicating that an active frame is > running). The old register COMP_STATUS is still there and still works, > although the new one is preferred in downstream sources. Probably > because it allows to choose Soundwire instance per CPU. Most of the > code allowing to use new register for Soundwire v2.0.0 was already there > as part of commit 312355a6a9f6 ("soundwire: qcom: add support for v2.0.0 > controller"), so switch to it in swrm_wait_for_frame_gen_enabled() > function. This should not have functional impact, because the old > register still behaves correctly. > > [...] Applied, thanks! [1/2] soundwire: qcom: use newer link status tregister on v2.0.0 commit: 5d78c7d684192e42241593a936ee60003d8ac064 [2/2] soundwire: qcom: handle command ignored interrupt commit: 16d568c8f646933710c980783d87d3f59a89b563 Best regards,
diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index f8fd2eb4a2bb..3ae3e5896308 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -817,8 +817,8 @@ static bool swrm_wait_for_frame_gen_enabled(struct qcom_swrm_ctrl *ctrl) int comp_sts; do { - ctrl->reg_read(ctrl, SWRM_COMP_STATUS, &comp_sts); - + ctrl->reg_read(ctrl, ctrl->reg_layout[SWRM_REG_FRAME_GEN_ENABLED], + &comp_sts); if (comp_sts & SWRM_FRM_GEN_ENABLED) return true;
Soundwire v2.0.0 comes with a new register LINK_STATUS for the FRAME_GEN_ENABLED field (bit indicating that an active frame is running). The old register COMP_STATUS is still there and still works, although the new one is preferred in downstream sources. Probably because it allows to choose Soundwire instance per CPU. Most of the code allowing to use new register for Soundwire v2.0.0 was already there as part of commit 312355a6a9f6 ("soundwire: qcom: add support for v2.0.0 controller"), so switch to it in swrm_wait_for_frame_gen_enabled() function. This should not have functional impact, because the old register still behaves correctly. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- drivers/soundwire/qcom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)