ASoC: msm: rename msm8660 --> lpass
Signed-off-by: Bryan Huntsman <bryanh@codeaurora.org>
diff --git a/sound/soc/msm/Kconfig b/sound/soc/msm/Kconfig
index f24b8e0..092c4ce 100644
--- a/sound/soc/msm/Kconfig
+++ b/sound/soc/msm/Kconfig
@@ -71,27 +71,12 @@
config SND_SOC_MSM_HOSTLESS_PCM
tristate
-config SND_SOC_MSM8660_PCM
+config SND_SOC_LPASS_PCM
tristate
config SND_SOC_MSM8660_LPAIF
tristate
-config SND_SOC_MSM8660
- tristate "SoC Machine driver for MSM8660"
- depends on !SND_SOC_MSM8X60 && ARCH_MSM8X60
- select SND_SOC_MSM8660_PCM
- select SND_SOC_MSM8660_LPAIF
- select SND_SOC_TIMPANI
- select MARIMBA_CORE
- select SND_SOC_MSM_QDSP6_INTF
- default n
- help
- To add support for SoC audio on MSM8660 for direct playback
- to LPA buffer over DMA.The interface bypasses DSP and hence
- does not support any post/pre processing features.The driver
- would support full duplex playback/record sessions.
-
config SND_VOIP_PCM
tristate
diff --git a/sound/soc/msm/Makefile b/sound/soc/msm/Makefile
index 5d29983..9c7eba2 100644
--- a/sound/soc/msm/Makefile
+++ b/sound/soc/msm/Makefile
@@ -38,22 +38,19 @@
obj-$(CONFIG_SND_MVS_SOC) += snd-soc-msm-mvs.o
# 8660 ALSA Support
-snd-soc-msm8660-lpa-objs := msm8660-i2s.o msm8660-dma.o
-obj-$(CONFIG_SND_SOC_MSM8660_LPAIF) += snd-soc-msm8660-lpa.o
+snd-soc-lpass-objs := lpass-i2s.o lpass-dma.o
+obj-$(CONFIG_SND_SOC_MSM8660_LPAIF) += snd-soc-lpass.o
-snd-soc-msm8660-pcm-objs := msm8660-pcm.o
-obj-$(CONFIG_SND_SOC_MSM8660_PCM) += snd-soc-msm8660-pcm.o
-
-snd-soc-msm8660-objs := msm8660.o
-obj-$(CONFIG_SND_SOC_MSM8660) += snd-soc-msm8660.o
+snd-soc-lpass-pcm-objs := lpass-pcm.o
+obj-$(CONFIG_SND_SOC_LPASS_PCM) += snd-soc-lpass-pcm.o
#8660 VOIP Driver Support
snd-soc-msm-voip-objs := msm-voip.o
obj-$(CONFIG_SND_VOIP_PCM) += snd-soc-msm-voip.o
-snd-soc-msm8660-dma-objs := msm8660-dma.o
-obj-$(CONFIG_SND_SOC_MSM8X60) += snd-soc-msm8660-dma.o
+snd-soc-lpass-dma-objs := lpass-dma.o
+obj-$(CONFIG_SND_SOC_MSM8X60) += snd-soc-lpass-dma.o
# for MSM 8960 sound card driver
diff --git a/sound/soc/msm/msm8660-dma.c b/sound/soc/msm/lpass-dma.c
similarity index 99%
rename from sound/soc/msm/msm8660-dma.c
rename to sound/soc/msm/lpass-dma.c
index 8ab429a..84b6f1f 100644
--- a/sound/soc/msm/msm8660-dma.c
+++ b/sound/soc/msm/lpass-dma.c
@@ -29,7 +29,7 @@
#include <mach/msm_iomap-8x60.h>
#include <mach/audio_dma_msm8k.h>
#include <sound/dai.h>
-#include "msm8660-pcm.h"
+#include "lpass-pcm.h"
struct dai_baseinfo {
void __iomem *base;
diff --git a/sound/soc/msm/msm8660-i2s.c b/sound/soc/msm/lpass-i2s.c
similarity index 100%
rename from sound/soc/msm/msm8660-i2s.c
rename to sound/soc/msm/lpass-i2s.c
diff --git a/sound/soc/msm/msm8660-pcm.c b/sound/soc/msm/lpass-pcm.c
similarity index 99%
rename from sound/soc/msm/msm8660-pcm.c
rename to sound/soc/msm/lpass-pcm.c
index 6f6fe43..efd7c06 100644
--- a/sound/soc/msm/msm8660-pcm.c
+++ b/sound/soc/msm/lpass-pcm.c
@@ -19,7 +19,7 @@
#include <sound/soc.h>
#include <mach/audio_dma_msm8k.h>
#include <sound/dai.h>
-#include "msm8660-pcm.h"
+#include "lpass-pcm.h"
static const struct snd_pcm_hardware msm_pcm_hardware = {
.info = SNDRV_PCM_INFO_MMAP |
diff --git a/sound/soc/msm/msm8660-pcm.h b/sound/soc/msm/lpass-pcm.h
similarity index 100%
rename from sound/soc/msm/msm8660-pcm.h
rename to sound/soc/msm/lpass-pcm.h