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

Commit 800f9309 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: wcd9306: update the routing path for the anc blocks"

parents 6a7faf5c b2a522cb

sound/soc/codecs/wcd9306.c

+4 −0
Original line number Diff line number Diff line
@@ -3120,6 +3120,7 @@ static const struct snd_soc_dapm_route wcd9306_map[] = { 
	{"DEC3 MUX", "DMIC2", "DMIC2"},

	{"DEC3 MUX", "DMIC3", "DMIC3"},

	{"DEC3 MUX", "DMIC4", "DMIC4"},

	{"DEC3 MUX", "ANCFBTUNE1", "ANC1 MUX"},

	{"DEC3 MUX", NULL, "CDC_CONN"},



	{"DEC4 MUX", "ADC1", "ADC1"},
@@ -3131,6 +3132,7 @@ static const struct snd_soc_dapm_route wcd9306_map[] = { 
	{"DEC4 MUX", "DMIC2", "DMIC2"},

	{"DEC4 MUX", "DMIC3", "DMIC3"},

	{"DEC4 MUX", "DMIC4", "DMIC4"},

	{"DEC4 MUX", "ANCFBTUNE2", "ANC2 MUX"},

	{"DEC4 MUX", NULL, "CDC_CONN"},



	{"ADC5", NULL, "AMIC5"},
@@ -5422,6 +5424,8 @@ static int tapan_handle_pdata(struct tapan_priv *tapan) 
		0xEE, dmic_b1_ctl_value);

	snd_soc_update_bits(codec, TAPAN_A_CDC_ANC1_B2_CTL,

		0x1, anc_ctl_value);

	snd_soc_update_bits(codec, TAPAN_A_CDC_ANC2_B2_CTL,

		0x1, anc_ctl_value);



done:

	return rc;