Skip to content

Commit 5d78c7d

Browse files
krzkvinodkoul
authored andcommitted
soundwire: qcom: use newer link status tregister on v2.0.0
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 312355a ("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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Vinod Koul <[email protected]>
1 parent 0bb80ec commit 5d78c7d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/soundwire/qcom.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -801,8 +801,8 @@ static bool swrm_wait_for_frame_gen_enabled(struct qcom_swrm_ctrl *ctrl)
801801
int comp_sts;
802802

803803
do {
804-
ctrl->reg_read(ctrl, SWRM_COMP_STATUS, &comp_sts);
805-
804+
ctrl->reg_read(ctrl, ctrl->reg_layout[SWRM_REG_FRAME_GEN_ENABLED],
805+
&comp_sts);
806806
if (comp_sts & SWRM_FRM_GEN_ENABLED)
807807
return true;
808808

0 commit comments

Comments
 (0)