Support Codec Driver Rem Sound for WCD9330 Tomtom

Signed-off-by: Javier Sayago <admin@lonasdigital.com>
javilonas · May 23, 2015 · b270f28 · b270f28
1 parent 271a590
commit b270f28
Show file tree

Hide file tree

Showing 7 changed files with 660 additions and 2 deletions.
diff --git a/arch/arm/configs/apq8084_sec_defconfig b/arch/arm/configs/apq8084_sec_defconfig
@@ -454,6 +454,7 @@ CONFIG_MDNIE_LITE_TUNING=y
 CONFIG_SOUND=y
 CONFIG_SND=y
 CONFIG_SND_USB_AUDIO=y
+CONFIG_SND_REM=y
 CONFIG_SND_SOC=y
 CONFIG_SND_SOC_APQ8084=y
 CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=y

diff --git a/include/linux/mfd/wcd9xxx/Kbuild b/include/linux/mfd/wcd9xxx/Kbuild
@@ -1,3 +1,3 @@
 header-y += wcd9xxx_registers.h
 header-y += wcd9310_registers.h
-header-y += wcd9320_registers.h
+header-y += wcd9330_registers.h
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
@@ -600,5 +600,13 @@ config SND_SOC_MSM_HDMI_CODEC_RX
 	help
 	HDMI audio drivers should be built only if the platform
         supports hdmi panel.
+
+config SND_REM
+	bool "Rem Sound Engine"
+	default y
+	depends on SND_SOC_WCD9330
+	help
+        Compatible to WCD9330 TomTom codec driver
+	  Include the Rem Sound Engine
 
 source "sound/soc/codecs/dbmd2/Kconfig"
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
@@ -74,6 +74,10 @@ snd-soc-wcd9320-objs := wcd9320.o wcd9320-tables.o
 snd-soc-wcd9306-objs := wcd9306.o wcd9306-tables.o
 snd-soc-wcd9330-objs := wcd9330.o wcd9330-tables.o wcdcal-hwdep.o
 snd-soc-wcd9xxx-objs := wcd9xxx-resmgr.o wcd9xxx-mbhc.o wcd9xxx-common.o
+# Rem Sound Engine
+ifdef CONFIG_SND_REM
+snd-soc-wcd9330-objs += rem_sound.o
+endif
 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-wcd-cpe-objs := wcd_cpe_services.o wcd_cpe_core.o
@@ -276,4 +280,4 @@ obj-$(CONFIG_SND_SOC_TPA6130A2)	+= snd-soc-tpa6130a2.o
 obj-$(CONFIG_SND_SOC_ES_515)	+= audience/
 obj-$(CONFIG_SND_SOC_ES705)	+= audience/
 #DBMD2
-obj-$(CONFIG_SND_DSPG_DBMD2)	+= dbmd2/
+obj-$(CONFIG_SND_DSPG_DBMD2)	+= dbmd2/