Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40f00a72 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: wcd934x: Add missing INT0 interpolator path" into msm-4.9

parents 2e66c805 3570e6ca

sound/soc/codecs/wcd934x/wcd934x-routing.h

+2 −1
Original line number Diff line number Diff line
@@ -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", "RX6", "CDC_IF RX6 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 */

	{"RX INT1_2 MUX", "RX0", "CDC_IF RX0 MUX"},

sound/soc/codecs/wcd934x/wcd934x.c

+1 −1
Original line number Diff line number Diff line
@@ -8584,7 +8584,7 @@ static int tavil_handle_pdata(struct tavil_priv *tavil, 
	if (pdata->dmic_clk_drv ==

	    WCD9XXX_DMIC_CLK_DRIVE_UNDEFINED) {

		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",

			 __func__, pdata->dmic_clk_drv);

	}