duff/android_kernel_motorola_sm6225
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "soc: swr-mstr: Enable dual-mic SVA for ULP2 mode""

Browse Source
This commit is contained in:
qctecmdr authored and Gerrit - the friendly Code Review server committed 2020-02-24 23:01:17 -08:00
2 parents 3a8159f02a 80995e693b
commit a37160fdb9
2 files changed
+4 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/soc/swr-wcd.h
+1 -3
View File
@@ -32,10 +32,8 @@ struct swr_mstr_port {
};
#define MCLK_FREQ 9600000
#define MCLK_FREQ_LP 4800000
#define MCLK_FREQ_LP 600000
#define MCLK_FREQ_NATIVE 11289600
#define MCLK_FREQ_ULP1 1200000
#define MCLK_FREQ_ULP2 600000
#if (IS_ENABLED(CONFIG_SOUNDWIRE_WCD_CTRL) || \
IS_ENABLED(CONFIG_SOUNDWIRE_MSTR_CTRL))
soc/swr-mstr-ctrl.c
+3 -6
View File
@@ -1296,12 +1296,9 @@ static void swrm_apply_port_config(struct swr_master *master)
dev_dbg(swrm->dev, "%s: enter bank: %d master_ports: %d\n",
__func__, bank, master->num_port);
if (bank == 0)
swrm_cmd_fifo_wr_cmd(swrm, 0x01, 0xF, 0x00,
SWRS_SCP_HOST_CLK_DIV2_CTL_BANK(bank));
else
swrm_cmd_fifo_wr_cmd(swrm, 0x00, 0xF, 0x00,
SWRS_SCP_HOST_CLK_DIV2_CTL_BANK(bank));
swrm_cmd_fifo_wr_cmd(swrm, 0x01, 0xF, 0x00,
SWRS_SCP_HOST_CLK_DIV2_CTL_BANK(bank));
swrm_copy_data_port_config(master, bank);
}