Merge branch 'master' into next

5 files changed, 42 insertions, 22 deletions

diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig
index b502741692d6..bd7392c9657e 100644
--- a/sound/soc/davinci/Kconfig
+++ b/sound/soc/davinci/Kconfig
@@ -20,7 +20,7 @@ config SND_DAVINCI_SOC_EVM
 
 config SND_DAVINCI_SOC_SFFSDR
         tristate "SoC Audio support for SFFSDR"
-        depends on SND_DAVINCI_SOC && MACH_DAVINCI_SFFSDR
+        depends on SND_DAVINCI_SOC && MACH_SFFSDR
         select SND_DAVINCI_SOC_I2S
         select SND_SOC_PCM3008
         select SFFSDR_FPGA
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c
index 54851f318568..9b90b347007c 100644
--- a/sound/soc/davinci/davinci-evm.c
+++ b/sound/soc/davinci/davinci-evm.c
@@ -186,7 +186,8 @@ static int __init evm_init(void)
 
         platform_set_drvdata(evm_snd_device, &evm_snd_devdata);
         evm_snd_devdata.dev = &evm_snd_device->dev;
-        evm_snd_device->dev.platform_data = &evm_snd_data;
+        platform_device_add_data(evm_snd_device, &evm_snd_data,
+                                 sizeof(evm_snd_data));
 
         ret = platform_device_add_resources(evm_snd_device, evm_snd_resources,
                                             ARRAY_SIZE(evm_snd_resources));
diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c
index 0fee779e3c76..ffdb9439d3d8 100644
--- a/sound/soc/davinci/davinci-i2s.c
+++ b/sound/soc/davinci/davinci-i2s.c
@@ -499,6 +499,13 @@ static void davinci_i2s_remove(struct platform_device *pdev,
 
 #define DAVINCI_I2S_RATES       SNDRV_PCM_RATE_8000_96000
 
+static struct snd_soc_dai_ops davinci_i2s_dai_ops = {
+        .startup        = davinci_i2s_startup,
+        .trigger        = davinci_i2s_trigger,
+        .hw_params      = davinci_i2s_hw_params,
+        .set_fmt        = davinci_i2s_set_dai_fmt,
+};
+
 struct snd_soc_dai davinci_i2s_dai = {
         .name = "davinci-i2s",
         .id = 0,
@@ -514,12 +521,7 @@ struct snd_soc_dai davinci_i2s_dai = {
                 .channels_max = 2,
                 .rates = DAVINCI_I2S_RATES,
                 .formats = SNDRV_PCM_FMTBIT_S16_LE,},
-        .ops = {
-                .startup = davinci_i2s_startup,
-                .trigger = davinci_i2s_trigger,
-                .hw_params = davinci_i2s_hw_params,
-                .set_fmt = davinci_i2s_set_dai_fmt,
-        },
+        .ops = &davinci_i2s_dai_ops,
 };
 EXPORT_SYMBOL_GPL(davinci_i2s_dai);
 
diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c
index 366049d8578c..7af3b5b3a53d 100644
--- a/sound/soc/davinci/davinci-pcm.c
+++ b/sound/soc/davinci/davinci-pcm.c
@@ -286,7 +286,7 @@ static int davinci_pcm_mmap(struct snd_pcm_substream *substream,
                                      runtime->dma_bytes);
 }
 
-struct snd_pcm_ops davinci_pcm_ops = {
+static struct snd_pcm_ops davinci_pcm_ops = {
         .open =         davinci_pcm_open,
         .close =        davinci_pcm_close,
         .ioctl =        snd_pcm_lib_ioctl,
diff --git a/sound/soc/davinci/davinci-sffsdr.c b/sound/soc/davinci/davinci-sffsdr.c
index 4935d1bcbd8d..40eccfe9e358 100644
--- a/sound/soc/davinci/davinci-sffsdr.c
+++ b/sound/soc/davinci/davinci-sffsdr.c
@@ -25,7 +25,9 @@
 
 #include <asm/dma.h>
 #include <asm/mach-types.h>
+#ifdef CONFIG_SFFSDR_FPGA
 #include <asm/plat-sffsdr/sffsdr-fpga.h>
+#endif
 
 #include <mach/mcbsp.h>
 #include <mach/edma.h>
@@ -34,31 +36,45 @@
 #include "davinci-pcm.h"
 #include "davinci-i2s.h"
 
+/*
+ * CLKX and CLKR are the inputs for the Sample Rate Generator.
+ * FSX and FSR are outputs, driven by the sample Rate Generator.
+ */
+#define AUDIO_FORMAT (SND_SOC_DAIFMT_DSP_B |    \
+                      SND_SOC_DAIFMT_CBM_CFS |  \
+                      SND_SOC_DAIFMT_IB_NF)
+
 static int sffsdr_hw_params(struct snd_pcm_substream *substream,
-                            struct snd_pcm_hw_params *params,
-                            struct snd_soc_dai *dai)
+                            struct snd_pcm_hw_params *params)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
         int fs;
         int ret = 0;
 
-        /* Set cpu DAI configuration:
-         * CLKX and CLKR are the inputs for the Sample Rate Generator.
-         * FSX and FSR are outputs, driven by the sample Rate Generator. */
-        ret = snd_soc_dai_set_fmt(cpu_dai,
-                                  SND_SOC_DAIFMT_RIGHT_J |
-                                  SND_SOC_DAIFMT_CBM_CFS |
-                                  SND_SOC_DAIFMT_IB_NF);
-        if (ret < 0)
-                return ret;
-
         /* Fsref can be 32000, 44100 or 48000. */
         fs = params_rate(params);
 
+#ifndef CONFIG_SFFSDR_FPGA
+        /* Without the FPGA module, the Fs is fixed at 44100 Hz */
+        if (fs != 44100) {
+                pr_debug("warning: only 44.1 kHz is supported without SFFSDR FPGA module\n");
+                return -EINVAL;
+        }
+#endif
+
+        /* set cpu DAI configuration */
+        ret = snd_soc_dai_set_fmt(cpu_dai, AUDIO_FORMAT);
+        if (ret < 0)
+                return ret;
+
         pr_debug("sffsdr_hw_params: rate = %d Hz\n", fs);
 
+#ifndef CONFIG_SFFSDR_FPGA
+        return 0;
+#else
         return sffsdr_fpga_set_codec_fs(fs);
+#endif
 }
 
 static struct snd_soc_ops sffsdr_ops = {
@@ -127,7 +143,8 @@ static int __init sffsdr_init(void)
 
         platform_set_drvdata(sffsdr_snd_device, &sffsdr_snd_devdata);
         sffsdr_snd_devdata.dev = &sffsdr_snd_device->dev;
-        sffsdr_snd_device->dev.platform_data = &sffsdr_snd_data;
+        platform_device_add_data(sffsdr_snd_device, &sffsdr_snd_data,
+                                 sizeof(sffsdr_snd_data));
 
         ret = platform_device_add_resources(sffsdr_snd_device,
                                             sffsdr_snd_resources,