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

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

Merge "ASoC: wcd: Add support for MBHC ADC on WCD9340 codec" into msm-4.9

parents 4f71b5fe fc7d3f47

sound/soc/codecs/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -932,6 +932,13 @@ config AUDIO_EXT_CLK 
config SND_SOC_WCD_MBHC

	tristate

	default y if (SND_SOC_MSM8909_WCD=y || SND_SOC_SDM660_CDC=y || SND_SOC_WCD9335=y) && SND_SOC_MDMCALIFORNIUM!=y

	select SND_SOC_WCD_MBHC_LEGACY



config SND_SOC_WCD_MBHC_LEGACY

	tristate



config SND_SOC_WCD_MBHC_ADC

	tristate



config SND_SOC_WCD_DSP_MGR

	tristate

sound/soc/codecs/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -173,7 +173,11 @@ ifeq ($(CONFIG_COMMON_CLK_QCOM), y) 
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

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

ifeq ($(CONFIG_SND_SOC_WCD_MBHC_LEGACY), y)

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

else ifeq ($(CONFIG_SND_SOC_WCD_MBHC_ADC), y)

	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

sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include "sdm660-cdc-registers.h"

#include "msm-cdc-common.h"

#include "../../msm/sdm660-common.h"

#include "../wcd-mbhc-v2.h"

#include "../wcd-mbhc-v2-api.h"



#define DRV_NAME "pmic_analog_codec"

#define SDM660_CDC_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\