diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-12-05 21:34:56 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-12-05 21:34:56 -0800 |
| commit | d3909cc0cdf87dfc7660f1cb7ce63bb74a517372 (patch) | |
| tree | 6a72bb8757a913b45d0c992f1aec253eae5a58a7 | |
| parent | 1446ca0585d1969ad95b16be6af2370eeb124926 (diff) | |
| parent | 314f0ae55e92084463ac1188a7de96433e5de994 (diff) | |
Merge "soc: swr-wcd: Apply div2 setting on slave side before bank switch"
| -rw-r--r-- | drivers/soundwire/swr-wcd-ctrl.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/soundwire/swr-wcd-ctrl.c b/drivers/soundwire/swr-wcd-ctrl.c index a8458b9b6e3a..ce2cc512caa9 100644 --- a/drivers/soundwire/swr-wcd-ctrl.c +++ b/drivers/soundwire/swr-wcd-ctrl.c @@ -653,6 +653,10 @@ static u8 get_inactive_bank_num(struct swr_mstr_ctrl *swrm) static void enable_bank_switch(struct swr_mstr_ctrl *swrm, u8 bank, u8 row, u8 col) { + /* apply div2 setting for inactive bank before bank switch */ + swrm_cmd_fifo_wr_cmd(swrm, 0x01, 0xF, 0x00, + SWRS_SCP_HOST_CLK_DIV2_CTL_BANK(bank)); + swrm_cmd_fifo_wr_cmd(swrm, ((row << 3) | col), 0xF, 0xF, SWRS_SCP_FRAME_CTRL_BANK(bank)); } @@ -891,9 +895,6 @@ static void swrm_apply_port_config(struct swr_master *master) __func__, bank, master->num_port); - swrm_cmd_fifo_wr_cmd(swrm, 0x01, 0xF, 0x00, - SWRS_SCP_HOST_CLK_DIV2_CTL_BANK(bank)); - swrm_copy_data_port_config(master, bank); } |