ASoC: Samsung: Merge neo1937_wm8753 and neo1973_gta02_wm8753 sound board driver

The neo1973(GTA01) and neo1973_gta02(GTA02) have a very similar audio hardware
setup. They both use the same codec with the same routing to the gsm modem and
bluetooth chip. But they do use different AMPs though and there are some minor
differences in the speaker setup.

As a result most of the code of those two drivers is identical.
So from a maintenance point of view it makes sense to merge them into a single
driver. It also reduces the size of kernel images supporting both the GTA01 and
GTA02.

As a side-effect of this merge the GTA01 for example gains support for routing
audio to and from the bluetooth DAI.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 5 insertions, 14 deletions

diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index ba78e26e20f2..c3014e821570 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -35,24 +35,15 @@ config SND_SAMSUNG_I2S
         tristate
 
 config SND_SOC_SAMSUNG_NEO1973_WM8753
-        tristate "SoC I2S Audio support for NEO1973 - WM8753"
-        depends on SND_SOC_SAMSUNG && MACH_NEO1973_GTA01
+        tristate "Audio support for Openmoko Neo1973 Smartphones (GTA01/GTA02)"
+        depends on SND_SOC_SAMSUNG && (MACH_NEO1973_GTA01 || MACH_NEO1973_GTA02)
         select SND_S3C24XX_I2S
         select SND_SOC_WM8753
-        select SND_SOC_LM4857
+        select SND_SOC_LM4857 if MACH_NEO1973_GTA01
         help
-          Say Y if you want to add support for SoC audio on smdk2440
-          with the WM8753.
+          Say Y here to enable audio support for the Openmoko Neo1973
+          Smartphones.
 
-config SND_SOC_SAMSUNG_NEO1973_GTA02_WM8753
-        tristate "Audio support for the Openmoko Neo FreeRunner (GTA02)"
-        depends on SND_SOC_SAMSUNG && MACH_NEO1973_GTA02
-        select SND_S3C24XX_I2S
-        select SND_SOC_WM8753
-        help
-          This driver provides audio support for the Openmoko Neo FreeRunner
-          smartphone.
-          
 config SND_SOC_SAMSUNG_JIVE_WM8750
         tristate "SoC I2S Audio support for Jive"
         depends on SND_SOC_SAMSUNG && MACH_JIVE