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

asoc: bolero: Update route map to enable MCLK for adie loopback

Browse source 
For ADIE loopback, MCLK needs to be enabled.
Associate the macro MCLK widgets to respective
rx and tx paths in route map.

Change-Id: I5632c3016146c5c5d822ae6fe438010904cf434b
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
This commit is contained in:
Laxminath Kasam 2018-08-06 20:19:40 +05:30
parent d2d8d9f683
commit fc281adbdd
3 changed files with 16 additions and 0 deletions

5
asoc/codecs/bolero/rx-macro.c
View file

@ -2254,6 +2254,7 @@ static const struct snd_soc_dapm_route rx_audio_map[] = {
{"RX INT0 MIX2", NULL, "RX INT0 MIX2 INP"},
{"RX INT0 DEM MUX", "CLSH_DSM_OUT", "RX INT0 MIX2"},
{"HPHL_OUT", NULL, "RX INT0 DEM MUX"},
{"HPHL_OUT", NULL, "RX_MCLK"},
{"RX INT1_1 INTERP", NULL, "RX INT1_1 MIX1"},
{"RX INT1 SEC MIX", NULL, "RX INT1_1 INTERP"},
@ -2261,13 +2262,16 @@ static const struct snd_soc_dapm_route rx_audio_map[] = {
{"RX INT1 MIX2", NULL, "RX INT1 MIX2 INP"},
{"RX INT1 DEM MUX", "CLSH_DSM_OUT", "RX INT1 MIX2"},
{"HPHR_OUT", NULL, "RX INT1 DEM MUX"},
{"HPHR_OUT", NULL, "RX_MCLK"},
{"RX INT2_1 INTERP", NULL, "RX INT2_1 MIX1"},
{"RX INT2 SEC MIX", NULL, "RX INT2_1 INTERP"},
{"RX INT2 MIX2", NULL, "RX INT2 SEC MIX"},
{"RX INT2 MIX2", NULL, "RX INT2 MIX2 INP"},
{"AUX_OUT", NULL, "RX INT2 MIX2"},
{"AUX_OUT", NULL, "RX_MCLK"},
{"IIR0", NULL, "RX_MCLK"},
{"IIR0", NULL, "IIR0 INP0 MUX"},
{"IIR0 INP0 MUX", "DEC0", "RX_TX DEC0_INP"},
{"IIR0 INP0 MUX", "DEC1", "RX_TX DEC1_INP"},
@ -2313,6 +2317,7 @@ static const struct snd_soc_dapm_route rx_audio_map[] = {
{"IIR0 INP3 MUX", "RX4", "RX_RX4"},
{"IIR0 INP3 MUX", "RX5", "RX_RX5"},
{"IIR1", NULL, "RX_MCLK"},
{"IIR1", NULL, "IIR1 INP0 MUX"},
{"IIR1 INP0 MUX", "DEC0", "RX_TX DEC0_INP"},
{"IIR1 INP0 MUX", "DEC1", "RX_TX DEC1_INP"},

9
asoc/codecs/bolero/tx-macro.c
View file

@ -1056,6 +1056,15 @@ static const struct snd_soc_dapm_route tx_audio_map[] = {
{"TX_AIF2_CAP Mixer", "DEC6", "TX DEC6 MUX"},
{"TX_AIF2_CAP Mixer", "DEC7", "TX DEC7 MUX"},
{"TX DEC0 MUX", NULL, "TX_MCLK"},
{"TX DEC1 MUX", NULL, "TX_MCLK"},
{"TX DEC2 MUX", NULL, "TX_MCLK"},
{"TX DEC3 MUX", NULL, "TX_MCLK"},
{"TX DEC4 MUX", NULL, "TX_MCLK"},
{"TX DEC5 MUX", NULL, "TX_MCLK"},
{"TX DEC6 MUX", NULL, "TX_MCLK"},
{"TX DEC7 MUX", NULL, "TX_MCLK"},
{"TX DEC0 MUX", "MSM_DMIC", "TX DMIC MUX0"},
{"TX DMIC MUX0", "DMIC0", "TX DMIC0"},
{"TX DMIC MUX0", "DMIC1", "TX DMIC1"},

2
asoc/codecs/bolero/wsa-macro.c
View file

@ -1912,6 +1912,7 @@ static const struct snd_soc_dapm_route wsa_audio_map[] = {
{"WSA_RX INT0 INTERP", NULL, "WSA_RX INT0 SEC MIX"},
{"WSA_RX INT0 CHAIN", NULL, "WSA_RX INT0 INTERP"},
{"WSA_SPK1 OUT", NULL, "WSA_RX INT0 CHAIN"},
{"WSA_SPK1 OUT", NULL, "WSA_MCLK"},
{"WSA_RX1 INP0", "RX0", "WSA RX0"},
{"WSA_RX1 INP0", "RX1", "WSA RX1"},
@ -1941,6 +1942,7 @@ static const struct snd_soc_dapm_route wsa_audio_map[] = {
{"WSA_RX INT1 INTERP", NULL, "WSA_RX INT1 SEC MIX"},
{"WSA_RX INT1 CHAIN", NULL, "WSA_RX INT1 INTERP"},
{"WSA_SPK2 OUT", NULL, "WSA_RX INT1 CHAIN"},
{"WSA_SPK2 OUT", NULL, "WSA_MCLK"},
};
static const struct wsa_macro_reg_mask_val wsa_macro_reg_init[] = {