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

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

Merge "ASoC: wcd9xxx: Add support to build codecs as module"

parents c671dd93 858132b0

arch/arm64/configs/sdm845-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -332,6 +332,7 @@ CONFIG_QTI_VIRTUAL_SENSOR=y 
CONFIG_QTI_REG_COOLING_DEVICE=y

CONFIG_MFD_I2C_PMIC=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_WCD9XXX_CODEC_CORE=y

CONFIG_WCD934X_CODEC=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_CPRH_KBSS=y

arch/arm64/configs/sdm845_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -339,6 +339,7 @@ CONFIG_QTI_VIRTUAL_SENSOR=y 
CONFIG_QTI_REG_COOLING_DEVICE=y

CONFIG_MFD_I2C_PMIC=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_WCD9XXX_CODEC_CORE=y

CONFIG_WCD934X_CODEC=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_CPRH_KBSS=y

include/sound/wcd-dsp-mgr.h

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#define __WCD_DSP_MGR_H__



#include <linux/types.h>

#include <linux/device.h>



/*

 * These enums correspond to the component types
@@ -140,4 +141,6 @@ struct wdsp_mgr_ops { 
	int (*resume)(struct device *wdsp_dev);

};



int wcd_dsp_mgr_init(void);

void wcd_dsp_mgr_exit(void);

#endif /* end of __WCD_DSP_MGR_H__ */

sound/soc/codecs/Kconfig

+6 −5
Original line number Diff line number Diff line
@@ -880,19 +880,20 @@ config SND_SOC_WCD934X_DSD 


config SND_SOC_WCD9335

        tristate

	depends on WCD9335_CODEC

	select SND_SOC_WCD9XXX

	select SND_SOC_WCD_MBHC

	select SND_SOC_WCD_MBHC_LEGACY

	select SND_SOC_WCD_CPE



config SND_SOC_WCD934X

        tristate

	depends on WCD934X_CODEC

	select SND_SOC_WCD9XXX_V2

	select SND_SOC_WCD9XXX

	select AUDIO_EXT_CLK

	select SND_SOC_WCD_DSP_MGR

	select SND_SOC_WCD_SPI

	select SND_SOC_WCD934X_MBHC

        select SND_SOC_WCD934X_DSD

	select WCD_DSP_GLINK



config SND_SOC_WCD934X_MBHC

        tristate
@@ -913,9 +914,9 @@ config SND_SOC_WSA881X_ANALOG 
        tristate

	select REGMAP_I2C



config SND_SOC_WCD9XXX_V2

config SND_SOC_WCD9XXX

	tristate

	default y if SND_SOC_WCD9335=y

	default y if SND_SOC_WCD9335=y || SND_SOC_WCD934X=y



config SND_SOC_WCD_CPE

	tristate

sound/soc/codecs/Makefile

+8 −15
Original line number Diff line number Diff line
@@ -160,25 +160,25 @@ snd-soc-uda134x-objs := uda134x.o 
snd-soc-uda1380-objs := uda1380.o

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

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

snd-soc-wcd9xxx-v2-objs := wcd9xxx-common-v2.o wcd9xxx-resmgr-v2.o wcdcal-hwdep.o

snd-soc-wcd9xxx-objs := wcd9xxx-common-v2.o wcd9xxx-resmgr-v2.o \

			wcdcal-hwdep.o wcd-dsp-mgr.o wcd-dsp-utils.o \

			wcd9xxx-soc-init.o

ifeq ($(CONFIG_COMMON_CLK_MSM), y)

	audio-ext-clock-objs := audio-ext-clk.o

	snd-soc-wcd9xxx-objs += audio-ext-clk.o

endif



ifeq ($(CONFIG_COMMON_CLK_QCOM), y)

	audio-ext-clock-up-objs := audio-ext-clk-up.o

	snd-soc-wcd9xxx-objs += audio-ext-clk-up.o

endif

snd-soc-wcd-cpe-objs := wcd_cpe_services.o wcd_cpe_core.o

snd-soc-wsa881x-objs := wsa881x.o wsa881x-tables.o wsa881x-regmap.o wsa881x-temp-sensor.o

ifeq ($(CONFIG_SND_SOC_WCD_MBHC_LEGACY), y)

ifneq (,$(filter $(CONFIG_SND_SOC_WCD_MBHC_LEGACY),y m))

	snd-soc-wcd-mbhc-objs := wcd-mbhc-v2.o wcd-mbhc-legacy.o

else ifeq ($(CONFIG_SND_SOC_WCD_MBHC_ADC), y)

else ifneq (,$(filter $(CONFIG_SND_SOC_WCD_MBHC_ADC),y m))

	snd-soc-wcd-mbhc-objs := wcd-mbhc-v2.o wcd-mbhc-adc.o

endif

snd-soc-wsa881x-analog-objs := wsa881x-analog.o wsa881x-tables-analog.o

snd-soc-wsa881x-analog-objs += wsa881x-regmap-analog.o wsa881x-irq.o

snd-soc-wcd-dsp-utils-objs := wcd-dsp-utils.o

snd-soc-wcd-dsp-mgr-objs := wcd-dsp-mgr.o

snd-soc-wcd-spi-objs := wcd-spi.o

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

snd-soc-wm-adsp-objs := wm_adsp.o
@@ -406,19 +406,12 @@ obj-$(CONFIG_SND_SOC_UDA1380) += snd-soc-uda1380.o 
obj-$(CONFIG_SND_SOC_WCD9320)	+= snd-soc-wcd9320.o

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

obj-$(CONFIG_SND_SOC_WCD934X)	+= wcd934x/

ifeq ($(CONFIG_COMMON_CLK_MSM), y)

	obj-$(CONFIG_AUDIO_EXT_CLK)	+= audio-ext-clock.o

endif

ifeq ($(CONFIG_COMMON_CLK_QCOM), y)

	obj-$(CONFIG_AUDIO_EXT_CLK)     += audio-ext-clock-up.o

endif

obj-$(CONFIG_SND_SOC_WCD9XXX_V2) += snd-soc-wcd9xxx-v2.o

obj-$(CONFIG_SND_SOC_WCD9XXX) += snd-soc-wcd9xxx.o

obj-$(CONFIG_SND_SOC_WCD_CPE)   += snd-soc-wcd-cpe.o

obj-$(CONFIG_SND_SOC_WCD_MBHC)  += snd-soc-wcd-mbhc.o

obj-$(CONFIG_SND_SOC_WSA881X)	+= snd-soc-wsa881x.o

obj-$(CONFIG_SND_SOC_WSA881X_ANALOG)	+= snd-soc-wsa881x-analog.o

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

obj-$(CONFIG_SND_SOC_WCD_DSP_MGR)	+= snd-soc-wcd-dsp-mgr.o snd-soc-wcd-dsp-utils.o

obj-$(CONFIG_SND_SOC_WCD_SPI)  += snd-soc-wcd-spi.o

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

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