u8500: sound: update sound build support for u8500

Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>

4 files changed, 59 insertions, 13 deletions

diff --git a/sound/Kconfig b/sound/Kconfig
index fcad760f569..d538c24efc6 100644
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -23,6 +23,45 @@ menuconfig SOUND
 	  and read <file:Documentation/sound/oss/README.modules>; the module
 	  will be called soundcore.
 
+# added for U8500 audio codec device
+config U8500_ACODEC
+	tristate "U8500 audio codec generic module (used both by SAA and ALSA)"
+	depends on STM_MSP_I2S
+	default Y
+	help
+	  Say Y here if you have a U8500 based device
+	  and want to use its audio codec chip.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called u8500mod_acodec.
+
+choice
+	prompt "Audio codec type"
+	depends on U8500_ACODEC
+	default U8500_AB8500_ACODEC
+
+	config U8500_AB8500_ACODEC
+	bool "U8500 ab8500 audio codec"
+endchoice
+
+choice
+	prompt "Driver mode"
+	depends on U8500_AB8500_ACODEC
+	default U8500_ACODEC_DMA
+
+	config U8500_ACODEC_DMA
+	depends on U8500_AB8500_ACODEC
+	bool   "DMA mode"
+
+	config U8500_ACODEC_POLL
+	depends on U8500_AB8500_ACODEC
+	bool   "Polling mode"
+
+	config U8500_ACODEC_INTR
+	depends on U8500_AB8500_ACODEC
+	bool   "Interrupt mode"
+endchoice
+
 if SOUND
 
 config SOUND_OSS_CORE
diff --git a/sound/Makefile b/sound/Makefile
index ec467decfa7..826e8db680a 100644
--- a/sound/Makefile
+++ b/sound/Makefile
@@ -1,6 +1,7 @@
 # Makefile for the Linux sound card driver
 #
 
+obj-$(CONFIG_U8500_ACODEC) += u8500mod_acodec.o
 obj-$(CONFIG_SOUND) += soundcore.o
 obj-$(CONFIG_SOUND_PRIME) += sound_firmware.o
 obj-$(CONFIG_SOUND_PRIME) += oss/
@@ -16,4 +17,7 @@ ifeq ($(CONFIG_SND),y)
   obj-y += last.o
 endif
 
+ifeq ($(CONFIG_U8500_AB8500_ACODEC),y)
+u8500mod_acodec-objs := u8500_acodec_ab8500.o ab8500_codec.o
+endif
 soundcore-objs  := sound_core.o
diff --git a/sound/arm/Kconfig b/sound/arm/Kconfig
index 885683a3b0b..61069874ab7 100644
--- a/sound/arm/Kconfig
+++ b/sound/arm/Kconfig
@@ -21,23 +21,26 @@ config SND_PXA2XX_PCM
 	tristate
 	select SND_PCM
 
-config SND_PXA2XX_LIB
-	tristate
-	select SND_AC97_CODEC if SND_PXA2XX_LIB_AC97
-
-config SND_PXA2XX_LIB_AC97
-	bool
-
 config SND_PXA2XX_AC97
 	tristate "AC97 driver for the Intel PXA2xx chip"
 	depends on ARCH_PXA
 	select SND_PXA2XX_PCM
 	select SND_AC97_CODEC
-	select SND_PXA2XX_LIB
-	select SND_PXA2XX_LIB_AC97
 	help
 	  Say Y or M if you want to support any AC97 codec attached to
 	  the PXA2xx AC97 interface.
 
+config SND_U8500_ALSA_AB8500
+	tristate "U8500 alsa support for AB8500"
+	depends on SND && STM_DMA && U8500_ACODEC && U8500_AB8500_ACODEC
+	default y
+	select SND_PCM
+	help
+	  Say Y here if you have a u8500 based device
+	  and want to use alsa for pcm playback and capture.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called u8500mod_alsa.
+
 endif	# SND_ARM
 
diff --git a/sound/arm/Makefile b/sound/arm/Makefile
index 8c0c851d464..964765a40f3 100644
--- a/sound/arm/Makefile
+++ b/sound/arm/Makefile
@@ -8,9 +8,9 @@ snd-aaci-objs			:= aaci.o
 obj-$(CONFIG_SND_PXA2XX_PCM)	+= snd-pxa2xx-pcm.o
 snd-pxa2xx-pcm-objs		:= pxa2xx-pcm.o
 
-obj-$(CONFIG_SND_PXA2XX_LIB)	+= snd-pxa2xx-lib.o
-snd-pxa2xx-lib-y		:= pxa2xx-pcm-lib.o
-snd-pxa2xx-lib-$(CONFIG_SND_PXA2XX_LIB_AC97)	+= pxa2xx-ac97-lib.o
-
 obj-$(CONFIG_SND_PXA2XX_AC97)	+= snd-pxa2xx-ac97.o
 snd-pxa2xx-ac97-objs		:= pxa2xx-ac97.o
+obj-$(CONFIG_SND_U8500_ALSA_AB8500)  += u8500mod_alsa.o
+ifeq ($(CONFIG_SND_U8500_ALSA_AB8500),y)
+u8500mod_alsa-objs		:= u8500_alsa_ab8500.o devdma.o
+endif