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

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

Browse source
This commit is contained in:
Linux Build Service Account 2018-08-11 02:52:55 -07:00 committed by Gerrit - the friendly Code Review server
commit fc9ba4e933
3 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2255,6 +2255,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"},
@ -2262,13 +2263,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"},
@ -2314,6 +2318,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

@ -1057,6 +1057,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

@ -1913,6 +1913,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"},
@ -1942,6 +1943,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[] = {