evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ASoC: wcd934x: Add missing INT0 interpolator path"

Browse source
This commit is contained in:
Linux Build Service Account 2016-12-20 14:04:48 -08:00 • committed by Gerrit - the friendly Code Review server
commit b0ba6bde9d
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sound/soc/codecs/wcd934x/wcd934x-routing.h
View file

@ -761,7 +761,8 @@ const struct snd_soc_dapm_route tavil_audio_map[] = {
{"RX INT0_2 MUX", "RX5", "CDC_IF RX5 MUX"}, {"RX INT0_2 MUX", "RX5", "CDC_IF RX5 MUX"},
{"RX INT0_2 MUX", "RX6", "CDC_IF RX6 MUX"}, {"RX INT0_2 MUX", "RX6", "CDC_IF RX6 MUX"},
{"RX INT0_2 MUX", "RX7", "CDC_IF RX7 MUX"}, {"RX INT0_2 MUX", "RX7", "CDC_IF RX7 MUX"},
{"RX INT0 SEC MIX", NULL, "RX INT0_2 MUX"}, {"RX INT0_2 INTERP", NULL, "RX INT0_2 MUX"},
{"RX INT0 SEC MIX", NULL, "RX INT0_2 INTERP"},
/* Mixing path INT1 */ /* Mixing path INT1 */
{"RX INT1_2 MUX", "RX0", "CDC_IF RX0 MUX"}, {"RX INT1_2 MUX", "RX0", "CDC_IF RX0 MUX"},

2
sound/soc/codecs/wcd934x/wcd934x.c
View file

@ -8589,7 +8589,7 @@ static int tavil_handle_pdata(struct tavil_priv *tavil,
if (pdata->dmic_clk_drv == if (pdata->dmic_clk_drv ==
WCD9XXX_DMIC_CLK_DRIVE_UNDEFINED) { WCD9XXX_DMIC_CLK_DRIVE_UNDEFINED) {
pdata->dmic_clk_drv = WCD934X_DMIC_CLK_DRIVE_DEFAULT; pdata->dmic_clk_drv = WCD934X_DMIC_CLK_DRIVE_DEFAULT;
dev_info(codec->dev, dev_dbg(codec->dev,
"%s: dmic_clk_strength invalid, default = %d\n", "%s: dmic_clk_strength invalid, default = %d\n",
__func__, pdata->dmic_clk_drv); __func__, pdata->dmic_clk_drv);
} }