Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Revert change to enable dual-mic SVA as speaker protection
regressed with the change.

This reverts commit 51672c60ea.
This commit is contained in:
Vatsal Bucha 2020-02-20 14:35:44 +05:30
parent c20b6400a8
commit 80995e693b
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/soc/swr-wcd.h
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))

9
soc/swr-mstr-ctrl.c
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);
}