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

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

Merge "ASoC: msm8939: add support for external codec over slimbus"

parents 5dd36575 84abfaf3
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -229,7 +229,8 @@ int wcd9xxx_slim_write_repeat(struct wcd9xxx *wcd9xxx, unsigned short reg,
	defined(CONFIG_WCD9304_CODEC) || \
	defined(CONFIG_WCD9320_CODEC) || \
	defined(CONFIG_WCD9330_CODEC) || \
	defined(CONFIG_WCD9306_CODEC)
	defined(CONFIG_WCD9306_CODEC) || \
	defined(CONFIG_SND_SOC_MSM8X16_WCD)
int __init wcd9xxx_irq_of_init(struct device_node *node,
			       struct device_node *parent);
#else
+3 −1
Original line number Diff line number Diff line
@@ -74,7 +74,9 @@ snd-soc-wcd9xxx-objs := wcd9xxx-resmgr.o wcd9xxx-mbhc.o wcd9xxx-common.o
snd-soc-msm8x10-wcd-objs := msm8x10-wcd.o msm8x10-wcd-tables.o wcd9xxx-common.o
snd-soc-msm8x16-wcd-objs := msm8x16-wcd.o msm8x16-wcd-tables.o wcd-mbhc-v2.o
snd-soc-msm8x16-wcd-objs += wcd9xxx-common.o wcd9xxx-resmgr.o wcd9xxx-mbhc.o
snd-soc-msm8x16-wcd-objs += wcd9xxx-common.o wcd9306.o wcd9306-tables.o
snd-soc-msm8x16-wcd-objs += wcd9306.o wcd9306-tables.o
snd-soc-msm8x16-wcd-objs += wcd9330.o wcd9330-tables.o
snd-soc-msm8x16-wcd-objs += wcd_cpe_services.o wcd_cpe_core.o
snd-soc-wcd-cpe-objs := wcd_cpe_services.o wcd_cpe_core.o
snd-soc-wl1273-objs := wl1273.o
snd-soc-wm-adsp-objs := wm_adsp.o
+1 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ config SND_SOC_MSM8X16
	select SND_SOC_MSM_STUB
	select SND_SOC_MSM_HOSTLESS_PCM
	select SND_SOC_MSM8X16_WCD
	select SLIMBUS
	select MFD_CORE
	select SND_DYNAMIC_MINORS
	select QTI_PP
+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ snd-soc-mdm9630-objs := mdm9630.o
obj-$(CONFIG_SND_SOC_MDM9630) += snd-soc-mdm9630.o

# for MSM 8x16 sound card driver
snd-soc-msm8x16-objs := msm8x16.o
snd-soc-msm8x16-objs := msm8x16.o msm8939-slimbus.o
obj-$(CONFIG_SND_SOC_MSM8X16) += snd-soc-msm8x16.o

# for MSM 8994 sound card driver
+2216 −0

File added.

Preview size limit exceeded, changes collapsed.