Merge "soc: soundwire: Update sample interval configuration"

This commit is contained in:
qctecmdr
2020-04-26 23:42:49 -07:00
committed by Gerrit - the friendly Code Review server
4 changed files with 10 additions and 7 deletions

View File

@@ -1140,7 +1140,7 @@ static void swrm_disable_ports(struct swr_master *master,
(SWRM_DP_PORT_CTRL_BANK((i + 1), bank)), value);
if (mport->stream_type == SWR_PCM)
swrm_pcm_port_config(swrm, i, mport->dir, false);
swrm_pcm_port_config(swrm, (i + 1), mport->dir, false);
}
}
@@ -1213,7 +1213,7 @@ static void swrm_copy_data_port_config(struct swr_master *master, u8 bank)
continue;
if (mport->stream_type == SWR_PCM)
swrm_pcm_port_config(swrm, i, mport->dir, true);
swrm_pcm_port_config(swrm, (i + 1), mport->dir, true);
list_for_each_entry(port_req, &mport->port_req_list, list) {
slv_id = port_req->slave_port_id;
@@ -1303,7 +1303,7 @@ static void swrm_copy_data_port_config(struct swr_master *master, u8 bank)
<< SWRM_DP_PORT_CTRL_OFFSET2_SHFT);
value |= ((mport->offset1)
<< SWRM_DP_PORT_CTRL_OFFSET1_SHFT);
value |= mport->sinterval;
value |= (mport->sinterval & 0xFF);
reg[len] = SWRM_DP_PORT_CTRL_BANK((i + 1), bank);
@@ -1312,6 +1312,9 @@ static void swrm_copy_data_port_config(struct swr_master *master, u8 bank)
__func__, i,
(SWRM_DP_PORT_CTRL_BANK((i + 1), bank)), value);
reg[len] = SWRM_DP_SAMPLECTRL2_BANK((i + 1), bank);
val[len++] = ((mport->sinterval >> 8) & 0xFF);
if (mport->lane_ctrl != SWR_INVALID_PARAM) {
reg[len] = SWRM_DP_PORT_CTRL_2_BANK((i + 1), bank);
val[len++] = mport->lane_ctrl;