Merge remote-tracking branch 'asoc/topic/pxa' into asoc-next

7 files changed, 4 insertions, 408 deletions

diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig
index 4d2e46fae77c..b35809467547 100644
--- a/sound/soc/pxa/Kconfig
+++ b/sound/soc/pxa/Kconfig
@@ -130,26 +130,6 @@ config SND_PXA2XX_SOC_PALM27X
           Say Y if you want to add support for SoC audio on
           Palm T|X, T5, E2 or LifeDrive handheld computer.
 
-config SND_SOC_SAARB
-        tristate "SoC Audio support for Marvell Saarb"
-        depends on SND_PXA2XX_SOC && MACH_SAARB
-        select MFD_88PM860X
-        select SND_PXA_SOC_SSP
-        select SND_SOC_88PM860X
-        help
-          Say Y if you want to add support for SoC audio on the
-          Marvell Saarb reference platform.
-
-config SND_SOC_TAVOREVB3
-        tristate "SoC Audio support for Marvell Tavor EVB3"
-        depends on SND_PXA2XX_SOC && MACH_TAVOREVB3
-        select MFD_88PM860X
-        select SND_PXA_SOC_SSP
-        select SND_SOC_88PM860X
-        help
-          Say Y if you want to add support for SoC audio on the
-          Marvell Saarb reference platform.
-
 config SND_PXA910_SOC
         tristate "SoC Audio for Marvell PXA910 chip"
         depends on ARCH_MMP && SND
diff --git a/sound/soc/pxa/Makefile b/sound/soc/pxa/Makefile
index d8a265d2d5d7..2cff67b61dc3 100644
--- a/sound/soc/pxa/Makefile
+++ b/sound/soc/pxa/Makefile
@@ -23,8 +23,6 @@ snd-soc-e800-objs := e800_wm9712.o
 snd-soc-spitz-objs := spitz.o
 snd-soc-em-x270-objs := em-x270.o
 snd-soc-palm27x-objs := palm27x.o
-snd-soc-saarb-objs := saarb.o
-snd-soc-tavorevb3-objs := tavorevb3.o
 snd-soc-zylonite-objs := zylonite.o
 snd-soc-hx4700-objs := hx4700.o
 snd-soc-magician-objs := magician.o
@@ -48,8 +46,6 @@ obj-$(CONFIG_SND_PXA2XX_SOC_HX4700) += snd-soc-hx4700.o
 obj-$(CONFIG_SND_PXA2XX_SOC_MAGICIAN) += snd-soc-magician.o
 obj-$(CONFIG_SND_PXA2XX_SOC_MIOA701) += snd-soc-mioa701.o
 obj-$(CONFIG_SND_PXA2XX_SOC_Z2) += snd-soc-z2.o
-obj-$(CONFIG_SND_SOC_SAARB) += snd-soc-saarb.o
-obj-$(CONFIG_SND_SOC_TAVOREVB3) += snd-soc-tavorevb3.o
 obj-$(CONFIG_SND_SOC_ZYLONITE) += snd-soc-zylonite.o
 obj-$(CONFIG_SND_PXA2XX_SOC_IMOTE2) += snd-soc-imote2.o
 obj-$(CONFIG_SND_SOC_RAUMFELD) += snd-soc-raumfeld.o
diff --git a/sound/soc/pxa/mmp-pcm.c b/sound/soc/pxa/mmp-pcm.c
index 349930015264..5d57e071cdf5 100644
--- a/sound/soc/pxa/mmp-pcm.c
+++ b/sound/soc/pxa/mmp-pcm.c
@@ -147,7 +147,7 @@ static int mmp_pcm_mmap(struct snd_pcm_substream *substream,
                 vma->vm_end - vma->vm_start, vma->vm_page_prot);
 }
 
-struct snd_pcm_ops mmp_pcm_ops = {
+static struct snd_pcm_ops mmp_pcm_ops = {
         .open           = mmp_pcm_open,
         .close          = snd_dmaengine_pcm_close_release_chan,
         .ioctl          = snd_pcm_lib_ioctl,
@@ -208,7 +208,7 @@ static int mmp_pcm_preallocate_dma_buffer(struct snd_pcm_substream *substream,
         return 0;
 }
 
-int mmp_pcm_new(struct snd_soc_pcm_runtime *rtd)
+static int mmp_pcm_new(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_pcm_substream *substream;
         struct snd_pcm *pcm = rtd->pcm;
@@ -229,7 +229,7 @@ err:
         return ret;
 }
 
-struct snd_soc_platform_driver mmp_soc_platform = {
+static struct snd_soc_platform_driver mmp_soc_platform = {
         .ops            = &mmp_pcm_ops,
         .pcm_new        = mmp_pcm_new,
         .pcm_free       = mmp_pcm_free_dma_buffers,
diff --git a/sound/soc/pxa/mmp-sspa.c b/sound/soc/pxa/mmp-sspa.c
index a64779980177..62142ce367c7 100644
--- a/sound/soc/pxa/mmp-sspa.c
+++ b/sound/soc/pxa/mmp-sspa.c
@@ -388,7 +388,7 @@ static struct snd_soc_dai_ops mmp_sspa_dai_ops = {
         .set_fmt        = mmp_sspa_set_dai_fmt,
 };
 
-struct snd_soc_dai_driver mmp_sspa_dai = {
+static struct snd_soc_dai_driver mmp_sspa_dai = {
         .probe = mmp_sspa_probe,
         .playback = {
                 .channels_min = 1,
diff --git a/sound/soc/pxa/saarb.c b/sound/soc/pxa/saarb.c
deleted file mode 100644
index c34146b776b4..000000000000
--- a/sound/soc/pxa/saarb.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * saarb.c -- SoC audio for saarb
- *
- * Copyright (C) 2010 Marvell International Ltd.
- *      Haojian Zhuang <haojian.zhuang@marvell.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/device.h>
-#include <linux/clk.h>
-#include <linux/i2c.h>
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/pcm_params.h>
-#include <sound/soc.h>
-#include <sound/jack.h>
-
-#include <asm/mach-types.h>
-
-#include "../codecs/88pm860x-codec.h"
-#include "pxa-ssp.h"
-
-static int saarb_pm860x_init(struct snd_soc_pcm_runtime *rtd);
-
-static struct platform_device *saarb_snd_device;
-
-static struct snd_soc_jack hs_jack, mic_jack;
-
-static struct snd_soc_jack_pin hs_jack_pins[] = {
-        { .pin = "Headset Stereophone", .mask = SND_JACK_HEADPHONE, },
-};
-
-static struct snd_soc_jack_pin mic_jack_pins[] = {
-        { .pin = "Headset Mic 2",       .mask = SND_JACK_MICROPHONE, },
-};
-
-/* saarb machine dapm widgets */
-static const struct snd_soc_dapm_widget saarb_dapm_widgets[] = {
-        SND_SOC_DAPM_HP("Headphone Stereophone", NULL),
-        SND_SOC_DAPM_LINE("Lineout Out 1", NULL),
-        SND_SOC_DAPM_LINE("Lineout Out 2", NULL),
-        SND_SOC_DAPM_SPK("Ext Speaker", NULL),
-        SND_SOC_DAPM_MIC("Ext Mic 1", NULL),
-        SND_SOC_DAPM_MIC("Headset Mic", NULL),
-        SND_SOC_DAPM_MIC("Ext Mic 3", NULL),
-};
-
-/* saarb machine audio map */
-static const struct snd_soc_dapm_route saarb_audio_map[] = {
-        {"Headset Stereophone", NULL, "HS1"},
-        {"Headset Stereophone", NULL, "HS2"},
-
-        {"Ext Speaker", NULL, "LSP"},
-        {"Ext Speaker", NULL, "LSN"},
-
-        {"Lineout Out 1", NULL, "LINEOUT1"},
-        {"Lineout Out 2", NULL, "LINEOUT2"},
-
-        {"MIC1P", NULL, "Mic1 Bias"},
-        {"MIC1N", NULL, "Mic1 Bias"},
-        {"Mic1 Bias", NULL, "Ext Mic 1"},
-
-        {"MIC2P", NULL, "Mic1 Bias"},
-        {"MIC2N", NULL, "Mic1 Bias"},
-        {"Mic1 Bias", NULL, "Headset Mic 2"},
-
-        {"MIC3P", NULL, "Mic3 Bias"},
-        {"MIC3N", NULL, "Mic3 Bias"},
-        {"Mic3 Bias", NULL, "Ext Mic 3"},
-};
-
-static int saarb_i2s_hw_params(struct snd_pcm_substream *substream,
-                                struct snd_pcm_hw_params *params)
-{
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_dai *codec_dai = rtd->codec_dai;
-        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-        int width = snd_pcm_format_physical_width(params_format(params));