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

Commit 8817d3f1 authored by Bhalchandra Gajare's avatar Bhalchandra Gajare
Browse files

ASoC: wcd9306: Fixup the DAPM routing as per codec capabilities 



Add mixer controls to enable sharing the same RX path between headphones
and lineout.

CRs-fixed: 536156, 545348
Change-Id: Ie62e5b8a92935a7dc25a9385ba816b6862977071
Signed-off-by: default avatarBhalchandra Gajare <gajare@codeaurora.org>
parent b8a2a10e

sound/soc/codecs/wcd9306.c

+6 −6
Original line number Diff line number Diff line
@@ -2892,7 +2892,7 @@ static const struct snd_soc_dapm_route audio_map[] = { 


	{"DAC1", "Switch", "CLASS_H_DSM MUX"},

	{"HPHL DAC", "Switch", "CLASS_H_DSM MUX"},

	{"HPHR DAC", NULL, "RX2 CHAIN"},

	{"HPHR DAC", NULL, "RDAC3 MUX"},



	{"LINEOUT1", NULL, "LINEOUT1 PA"},

	{"LINEOUT2", NULL, "LINEOUT2 PA"},
@@ -2903,11 +2903,14 @@ static const struct snd_soc_dapm_route audio_map[] = { 
	{"LINEOUT2 PA", NULL, "LINEOUT2_PA_MIXER"},

	{"LINEOUT2_PA_MIXER", NULL, "LINEOUT2 DAC"},



	{"LINEOUT1 DAC", NULL, "RX3 MIX1"},



	{"RDAC5 MUX", "DEM3_INV", "RX3 MIX1"},

	{"LINEOUT2 DAC", NULL, "RDAC5 MUX"},



	{"RDAC4 MUX", "DEM3", "RX3 MIX1"},

	{"RDAC4 MUX", "DEM2", "RX2 CHAIN"},

	{"LINEOUT1 DAC", NULL, "RDAC4 MUX"},



	{"SPK PA", NULL, "SPK DAC"},

	{"SPK DAC", NULL, "VDD_SPKDRV"},
@@ -2920,7 +2923,7 @@ static const struct snd_soc_dapm_route audio_map[] = { 
	{"LINEOUT1 DAC", NULL, "CDC_CP_VDD"},

	{"LINEOUT2 DAC", NULL, "CDC_CP_VDD"},



	{"RDAC3 MUX", "DEM2", "RX2 MIX1"},

	{"RDAC3 MUX", "DEM2", "RX2 CHAIN"},

	{"RDAC3 MUX", "DEM1", "RX1 CHAIN"},



	{"RX1 MIX1", NULL, "RX1 MIX1 INP1"},
@@ -3055,9 +3058,6 @@ static const struct snd_soc_dapm_route audio_map[] = { 
static const struct snd_soc_dapm_route wcd9302_map[] = {

	{"SPK DAC", "Switch", "RX3 MIX1"},



	{"RDAC4 MUX", "DEM3", "RX3 MIX1"},

	{"RDAC4 MUX", "DEM2", "RX2 CHAIN"},

	{"LINEOUT1 DAC", NULL, "RDAC4 MUX"},



	{"RDAC5 MUX", "DEM4", "RX3 MIX1"},

	{"RDAC5 MUX", "DEM3_INV", "RDAC4 MUX"},