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

Commit 23af2a61 authored by Laxminath Kasam's avatar Laxminath Kasam
Browse files

ASoC: enable compile for 8909 audio in 3.18 kernel 



Add support for 8909 audio in 3.18 kernel make
and config files.

Change-Id: I80b145a0f9d4dd5c619016464c243a05c1ba4682
Signed-off-by: default avatarLaxminath Kasam <lkasam@codeaurora.org>
parent a650ec38

sound/soc/codecs/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -630,13 +630,18 @@ config SND_SOC_WCD9330 
config SND_SOC_WCD9335

        tristate



config SND_SOC_WSA881X_SENSORS

	tristate



config SND_SOC_WSA881X

        tristate

	select REGMAP_SWR

	select SND_SOC_WSA881X_SENSORS



config SND_SOC_WSA881X_ANALOG

        tristate

	select REGMAP_I2C

	select SND_SOC_WSA881X_SENSORS



config SND_SOC_MSM8X16_WCD

	tristate

sound/soc/codecs/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -116,11 +116,12 @@ snd-soc-uda1380-objs := uda1380.o 
snd-soc-wcd9320-objs := wcd9320.o wcd9320-tables.o

snd-soc-wcd9330-objs := wcd9330.o wcd9330-tables.o

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

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

snd-soc-wcd9xxx-objs := wcd9xxx-resmgr.o wcd9xxx-mbhc.o wcd9xxx-common.o

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

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

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-wsa881x-objs := wsa881x.o wsa881x-tables.o wsa881x-regmap.o

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

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

snd-soc-msm8952-wcd-objs := msm8x16-wcd.o msm8x16-wcd-tables.o

snd-soc-wsa881x-analog-objs := wsa881x-analog.o wsa881x-tables-analog.o
@@ -305,6 +306,7 @@ obj-$(CONFIG_SND_SOC_UDA1380) += snd-soc-uda1380.o 
obj-$(CONFIG_SND_SOC_WCD9320)	+= snd-soc-wcd9320.o

obj-$(CONFIG_SND_SOC_WCD9330)	+= snd-soc-wcd9330.o

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

obj-$(CONFIG_SND_HWDEP) += wcdcal-hwdep.o

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

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

obj-$(CONFIG_SND_SOC_WCD9XXX_V2) += snd-soc-wcd9xxx-v2.o
@@ -313,6 +315,7 @@ 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_WSA881X_SENSORS) += snd-soc-wsa881x-sensor.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/msm/Kconfig

+20 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ config SND_SOC_MSM8996 


config SND_SOC_MSM8X16

	tristate "SoC Machine driver for MSM8916"

	depends on ARCH_MSMTITANIUM || ARCH_MSM8916 || ARCH_MSM8937

	depends on ARCH_MSMTITANIUM || ARCH_MSM8937

	select SND_SOC_QDSP6V2

	select SND_SOC_MSM_STUB

	select SND_SOC_MSM_HOSTLESS_PCM
@@ -222,4 +222,23 @@ config SND_SOC_MDM9607 
	 the machine drivers and the corresponding

	 DAI-links.



config SND_SOC_MSM8909

	tristate "SoC Machine driver for MSM8909 boards"

	depends on ARCH_MSM8909

	select SND_SOC_QDSP6V2

	select SND_SOC_MSM_STUB

	select SND_SOC_MSM_HOSTLESS_PCM

	select SND_DYNAMIC_MINORS

	select MSM_QDSP6_APRV3

	select MSM_QDSP6V2_CODECS

	select SND_SOC_MSM8X16_WCD

	select SND_SOC_WSA881X_ANALOG

	select SND_HWDEP

	help

	 To add support for SoC audio on MSM8909 boards.

	 This will enable sound soc drivers which

	 interfaces with DSP, also it will enable

	 the machine drivers and the corresponding

	 DAI-links.



endmenu

sound/soc/msm/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -36,3 +36,7 @@ obj-$(CONFIG_SND_SOC_MDMCALIFORNIUM) += snd-soc-mdmcalifornium.o 
# for MDM 9607 sound card driver

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

obj-$(CONFIG_SND_SOC_MDM9607) += snd-soc-mdm9607.o



# for MSM 8909 sound card driver

snd-soc-msm8909-objs := msm8952.o msm-audio-pinctrl.o

obj-$(CONFIG_SND_SOC_MSM8909) += snd-soc-msm8909.o

sound/soc/msm/qdsp6v2/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ snd-soc-qdsp6v2-objs += msm-dai-q6-v2.o msm-pcm-q6-v2.o msm-pcm-routing-v2.o \ 
			msm-pcm-afe-v2.o msm-pcm-voip-v2.o \

			msm-pcm-voice-v2.o msm-dai-q6-hdmi-v2.o \

			msm-lsm-client.o msm-pcm-host-voice-v2.o \

			msm-audio-effects-q6-v2.o msm-pcm-loopback-v2.o \

			msm-dai-slim.o

			msm-audio-effects-q6-v2.o msm-pcm-loopback-v2.o

obj-$(CONFIG_SLIMBUS) += msm-dai-slim.o audio_slimslave.o

obj-$(CONFIG_SND_SOC_QDSP6V2) += snd-soc-qdsp6v2.o msm-pcm-dtmf-v2.o \

				 msm-dai-stub-v2.o

obj-$(CONFIG_SND_HWDEP) += msm-pcm-routing-devdep.o
@@ -15,6 +15,6 @@ obj-$(CONFIG_DOLBY_DS2) += msm-ds2-dap-config.o 
obj-$(CONFIG_DTS_SRS_TM) += msm-dts-srs-tm-config.o

obj-$(CONFIG_QTI_PP) += msm-qti-pp-config.o

obj-y += audio_calibration.o audio_cal_utils.o q6adm.o q6afe.o q6asm.o \

	q6audio-v2.o q6voice.o q6core.o rtac.o q6lsm.o audio_slimslave.o

	q6audio-v2.o q6voice.o q6core.o rtac.o q6lsm.o

ocmem-audio-objs += audio_ocmem.o

obj-$(CONFIG_AUDIO_OCMEM) += ocmem-audio.o