Unverified Commit 04544222 authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Mark Brown
Browse files

ASoC: codecs: wcd938x: add audio routing and Kconfig 



This patch adds audio routing for both playback and capture and
Makefile and Kconfigs changes for wcd938x

Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20210609090943.7896-10-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d5add08f

sound/soc/codecs/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -234,6 +234,8 @@ config SND_SOC_ALL_CODECS 
	imply SND_SOC_UDA1380

	imply SND_SOC_WCD9335

	imply SND_SOC_WCD934X

	imply SND_SOC_WCD937X

	imply SND_SOC_WCD938X

	imply SND_SOC_LPASS_RX_MACRO

	imply SND_SOC_LPASS_TX_MACRO

	imply SND_SOC_WL1273
@@ -1554,6 +1556,18 @@ config SND_SOC_WCD934X 
	  The WCD9340/9341 is a audio codec IC Integrated in

	  Qualcomm SoCs like SDM845.



config SND_SOC_WCD938X

	tristate



config SND_SOC_WCD938X_SDW

	tristate "WCD9380/WCD9385 Codec - SDW"

	select SND_SOC_WCD938X

	depends on SOUNDWIRE

	select REGMAP_SOUNDWIRE

	help

	  The WCD9380/9385 is a audio codec IC Integrated in

	  Qualcomm SoCs like SM8250.



config SND_SOC_WL1273

	tristate

sound/soc/codecs/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -255,6 +255,8 @@ snd-soc-uda1380-objs := uda1380.o 
snd-soc-wcd-mbhc-objs := wcd-mbhc-v2.o

snd-soc-wcd9335-objs := wcd-clsh-v2.o wcd9335.o

snd-soc-wcd934x-objs := wcd-clsh-v2.o wcd934x.o

snd-soc-wcd938x-objs := wcd938x.o wcd-clsh-v2.o

snd-soc-wcd938x-sdw-objs := wcd938x-sdw.o

snd-soc-wl1273-objs := wl1273.o

snd-soc-wm-adsp-objs := wm_adsp.o

snd-soc-wm0010-objs := wm0010.o
@@ -580,6 +582,8 @@ obj-$(CONFIG_SND_SOC_UDA1380) += snd-soc-uda1380.o 
obj-$(CONFIG_SND_SOC_WCD_MBHC)	+= snd-soc-wcd-mbhc.o

obj-$(CONFIG_SND_SOC_WCD9335)	+= snd-soc-wcd9335.o

obj-$(CONFIG_SND_SOC_WCD934X)	+= snd-soc-wcd934x.o

obj-$(CONFIG_SND_SOC_WCD938X)	+= snd-soc-wcd938x.o

obj-$(CONFIG_SND_SOC_WCD938X_SDW) += snd-soc-wcd938x-sdw.o

obj-$(CONFIG_SND_SOC_WL1273)	+= snd-soc-wl1273.o

obj-$(CONFIG_SND_SOC_WM0010)	+= snd-soc-wm0010.o

obj-$(CONFIG_SND_SOC_WM1250_EV1) += snd-soc-wm1250-ev1.o

sound/soc/codecs/wcd938x.c

+94 −0
Original line number Diff line number Diff line
@@ -3133,6 +3133,98 @@ static const struct snd_soc_dapm_widget wcd938x_dapm_widgets[] = { 
	SND_SOC_DAPM_OUTPUT("AUX"),

	SND_SOC_DAPM_OUTPUT("HPHL"),

	SND_SOC_DAPM_OUTPUT("HPHR"),



};



static const struct snd_soc_dapm_route wcd938x_audio_map[] = {

	{"ADC1_OUTPUT", NULL, "ADC1_MIXER"},

	{"ADC1_MIXER", "Switch", "ADC1 REQ"},

	{"ADC1 REQ", NULL, "ADC1"},

	{"ADC1", NULL, "AMIC1"},



	{"ADC2_OUTPUT", NULL, "ADC2_MIXER"},

	{"ADC2_MIXER", "Switch", "ADC2 REQ"},

	{"ADC2 REQ", NULL, "ADC2"},

	{"ADC2", NULL, "HDR12 MUX"},

	{"HDR12 MUX", "NO_HDR12", "ADC2 MUX"},

	{"HDR12 MUX", "HDR12", "AMIC1"},

	{"ADC2 MUX", "INP3", "AMIC3"},

	{"ADC2 MUX", "INP2", "AMIC2"},



	{"ADC3_OUTPUT", NULL, "ADC3_MIXER"},

	{"ADC3_MIXER", "Switch", "ADC3 REQ"},

	{"ADC3 REQ", NULL, "ADC3"},

	{"ADC3", NULL, "HDR34 MUX"},

	{"HDR34 MUX", "NO_HDR34", "ADC3 MUX"},

	{"HDR34 MUX", "HDR34", "AMIC5"},

	{"ADC3 MUX", "INP4", "AMIC4"},

	{"ADC3 MUX", "INP6", "AMIC6"},



	{"ADC4_OUTPUT", NULL, "ADC4_MIXER"},

	{"ADC4_MIXER", "Switch", "ADC4 REQ"},

	{"ADC4 REQ", NULL, "ADC4"},

	{"ADC4", NULL, "ADC4 MUX"},

	{"ADC4 MUX", "INP5", "AMIC5"},

	{"ADC4 MUX", "INP7", "AMIC7"},



	{"DMIC1_OUTPUT", NULL, "DMIC1_MIXER"},

	{"DMIC1_MIXER", "Switch", "DMIC1"},



	{"DMIC2_OUTPUT", NULL, "DMIC2_MIXER"},

	{"DMIC2_MIXER", "Switch", "DMIC2"},



	{"DMIC3_OUTPUT", NULL, "DMIC3_MIXER"},

	{"DMIC3_MIXER", "Switch", "DMIC3"},



	{"DMIC4_OUTPUT", NULL, "DMIC4_MIXER"},

	{"DMIC4_MIXER", "Switch", "DMIC4"},



	{"DMIC5_OUTPUT", NULL, "DMIC5_MIXER"},

	{"DMIC5_MIXER", "Switch", "DMIC5"},



	{"DMIC6_OUTPUT", NULL, "DMIC6_MIXER"},

	{"DMIC6_MIXER", "Switch", "DMIC6"},



	{"DMIC7_OUTPUT", NULL, "DMIC7_MIXER"},

	{"DMIC7_MIXER", "Switch", "DMIC7"},



	{"DMIC8_OUTPUT", NULL, "DMIC8_MIXER"},

	{"DMIC8_MIXER", "Switch", "DMIC8"},



	{"IN1_HPHL", NULL, "VDD_BUCK"},

	{"IN1_HPHL", NULL, "CLS_H_PORT"},



	{"RX1", NULL, "IN1_HPHL"},

	{"RX1", NULL, "RXCLK"},

	{"RDAC1", NULL, "RX1"},

	{"HPHL_RDAC", "Switch", "RDAC1"},

	{"HPHL PGA", NULL, "HPHL_RDAC"},

	{"HPHL", NULL, "HPHL PGA"},



	{"IN2_HPHR", NULL, "VDD_BUCK"},

	{"IN2_HPHR", NULL, "CLS_H_PORT"},

	{"RX2", NULL, "IN2_HPHR"},

	{"RDAC2", NULL, "RX2"},

	{"RX2", NULL, "RXCLK"},

	{"HPHR_RDAC", "Switch", "RDAC2"},

	{"HPHR PGA", NULL, "HPHR_RDAC"},

	{"HPHR", NULL, "HPHR PGA"},



	{"IN3_AUX", NULL, "VDD_BUCK"},

	{"IN3_AUX", NULL, "CLS_H_PORT"},

	{"RX3", NULL, "IN3_AUX"},

	{"RDAC4", NULL, "RX3"},

	{"RX3", NULL, "RXCLK"},

	{"AUX_RDAC", "Switch", "RDAC4"},

	{"AUX PGA", NULL, "AUX_RDAC"},

	{"AUX", NULL, "AUX PGA"},



	{"RDAC3_MUX", "RX3", "RX3"},

	{"RDAC3_MUX", "RX1", "RX1"},

	{"RDAC3", NULL, "RDAC3_MUX"},

	{"EAR_RDAC", "Switch", "RDAC3"},

	{"EAR PGA", NULL, "EAR_RDAC"},

	{"EAR", NULL, "EAR PGA"},

};



static int wcd938x_get_micb_vout_ctl_val(u32 micb_mv)
@@ -3300,6 +3392,8 @@ static const struct snd_soc_component_driver soc_codec_dev_wcd938x = { 
	.num_controls = ARRAY_SIZE(wcd938x_snd_controls),

	.dapm_widgets = wcd938x_dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(wcd938x_dapm_widgets),

	.dapm_routes = wcd938x_audio_map,

	.num_dapm_routes = ARRAY_SIZE(wcd938x_audio_map),

};



static void wcd938x_dt_parse_micbias_info(struct device *dev, struct wcd938x_priv *wcd)