Merge "soc: soundwire: Update comp status check for SWR version 1.6"

This commit is contained in:
qctecmdr
2019-11-20 06:46:27 -08:00
committed by Gerrit - the friendly Code Review server

View File

@@ -500,12 +500,15 @@ static bool swrm_check_link_status(struct swr_mstr_ctrl *swrm, bool active)
int retry = SWRM_LINK_STATUS_RETRY_CNT; int retry = SWRM_LINK_STATUS_RETRY_CNT;
int ret = false; int ret = false;
int status = active ? 0x1 : 0x0; int status = active ? 0x1 : 0x0;
int comp_sts = 0x0;
if ((swrm->version <= SWRM_VERSION_1_5_1)) if ((swrm->version <= SWRM_VERSION_1_5_1))
return true; return true;
do { do {
if (swr_master_read(swrm, SWRM_COMP_STATUS) & status) { comp_sts = swr_master_read(swrm, SWRM_COMP_STATUS) & 0x01;
/* check comp status and status requested met */
if ((comp_sts && status) || (!comp_sts && !status)) {
ret = true; ret = true;
break; break;
} }