7 files changed, 356 insertions, 11 deletions

diff --git a/sound/soc/blackfin/Kconfig b/sound/soc/blackfin/Kconfig
index ae403597fd31..fe9d548a6837 100644
--- a/sound/soc/blackfin/Kconfig
+++ b/sound/soc/blackfin/Kconfig
@@ -10,13 +10,36 @@ config SND_BF5XX_I2S
 
 config SND_BF5XX_SOC_SSM2602
         tristate "SoC SSM2602 Audio support for BF52x ezkit"
-        depends on SND_BF5XX_I2S
+        depends on SND_BF5XX_I2S && (SPI_MASTER || I2C)
         select SND_BF5XX_SOC_I2S
         select SND_SOC_SSM2602
-        select I2C
         help
           Say Y if you want to add support for SoC audio on BF527-EZKIT.
 
+config SND_SOC_BFIN_EVAL_ADAU1701
+        tristate "Support for the EVAL-ADAU1701MINIZ board on Blackfin eval boards"
+        depends on SND_BF5XX_I2S
+        select SND_BF5XX_SOC_I2S
+        select SND_SOC_ADAU1701
+        select I2C
+        help
+          Say Y if you want to add support for the Analog Devices EVAL-ADAU1701MINIZ
+          board connected to one of the Blackfin evaluation boards like the
+          BF5XX-STAMP or BF5XX-EZKIT.
+
+config SND_SOC_BFIN_EVAL_ADAV80X
+        tristate "Support for the EVAL-ADAV80X boards on Blackfin eval boards"
+        depends on SND_BF5XX_I2S && (SPI_MASTER || I2C)
+        select SND_BF5XX_SOC_I2S
+        select SND_SOC_ADAV80X
+        help
+          Say Y if you want to add support for the Analog Devices EVAL-ADAV801 or
+          EVAL-ADAV803 board connected to one of the Blackfin evaluation boards
+          like the BF5XX-STAMP or BF5XX-EZKIT.
+
+          Note: This driver assumes that the ADAV80X digital record and playback
+          interfaces are connected to the first SPORT port on the BF5XX board.
+
 config SND_BF5XX_SOC_AD73311
         tristate "SoC AD73311 Audio support for Blackfin"
         depends on SND_BF5XX_I2S
diff --git a/sound/soc/blackfin/Makefile b/sound/soc/blackfin/Makefile
index 49af3f32aec8..6018bf52a234 100644
--- a/sound/soc/blackfin/Makefile
+++ b/sound/soc/blackfin/Makefile
@@ -21,9 +21,13 @@ snd-ad1980-objs := bf5xx-ad1980.o
 snd-ssm2602-objs := bf5xx-ssm2602.o
 snd-ad73311-objs := bf5xx-ad73311.o
 snd-ad193x-objs := bf5xx-ad193x.o
+snd-soc-bfin-eval-adau1701-objs := bfin-eval-adau1701.o
+snd-soc-bfin-eval-adav80x-objs := bfin-eval-adav80x.o
 
 obj-$(CONFIG_SND_BF5XX_SOC_AD1836) += snd-ad1836.o
 obj-$(CONFIG_SND_BF5XX_SOC_AD1980) += snd-ad1980.o
 obj-$(CONFIG_SND_BF5XX_SOC_SSM2602) += snd-ssm2602.o
 obj-$(CONFIG_SND_BF5XX_SOC_AD73311) += snd-ad73311.o
 obj-$(CONFIG_SND_BF5XX_SOC_AD193X) += snd-ad193x.o
+obj-$(CONFIG_SND_SOC_BFIN_EVAL_ADAU1701) += snd-soc-bfin-eval-adau1701.o
+obj-$(CONFIG_SND_SOC_BFIN_EVAL_ADAV80X) += snd-soc-bfin-eval-adav80x.o
diff --git a/sound/soc/blackfin/bf5xx-ac97-pcm.c b/sound/soc/blackfin/bf5xx-ac97-pcm.c
index 98b44b316e78..9e59f680bc19 100644
--- a/sound/soc/blackfin/bf5xx-ac97-pcm.c
+++ b/sound/soc/blackfin/bf5xx-ac97-pcm.c
@@ -418,9 +418,11 @@ static void bf5xx_pcm_free_dma_buffers(struct snd_pcm *pcm)
 
 static u64 bf5xx_pcm_dmamask = DMA_BIT_MASK(32);
 
-int bf5xx_pcm_ac97_new(struct snd_card *card, struct snd_soc_dai *dai,
-        struct snd_pcm *pcm)
+int bf5xx_pcm_ac97_new(struct snd_soc_pcm_runtime *rtd)
 {
+        struct snd_card *card = rtd->card->snd_card;
+        struct snd_soc_dai *dai = rtd->cpu_dai;
+        struct snd_pcm *pcm = rtd->pcm;
         int ret = 0;
 
         pr_debug("%s enter\n", __func__);
diff --git a/sound/soc/blackfin/bf5xx-i2s-pcm.c b/sound/soc/blackfin/bf5xx-i2s-pcm.c
index f1fd95bb6416..61ddf942fd4d 100644
--- a/sound/soc/blackfin/bf5xx-i2s-pcm.c
+++ b/sound/soc/blackfin/bf5xx-i2s-pcm.c
@@ -168,7 +168,7 @@ static int bf5xx_pcm_open(struct snd_pcm_substream *substream)
 
         snd_soc_set_runtime_hwparams(substream, &bf5xx_pcm_hardware);
 
-        ret = snd_pcm_hw_constraint_integer(runtime, \
+        ret = snd_pcm_hw_constraint_integer(runtime,
                         SNDRV_PCM_HW_PARAM_PERIODS);
         if (ret < 0)
                 goto out;
@@ -257,9 +257,11 @@ static void bf5xx_pcm_free_dma_buffers(struct snd_pcm *pcm)
 
 static u64 bf5xx_pcm_dmamask = DMA_BIT_MASK(32);
 
-int bf5xx_pcm_i2s_new(struct snd_card *card, struct snd_soc_dai *dai,
-        struct snd_pcm *pcm)
+int bf5xx_pcm_i2s_new(struct snd_soc_pcm_runtime *rtd)
 {
+        struct snd_card *card = rtd->card->snd_card;
+        struct snd_soc_dai *dai = rtd->cpu_dai;
+        struct snd_pcm *pcm = rtd->pcm;
         int ret = 0;
 
         pr_debug("%s enter\n", __func__);
@@ -304,8 +306,8 @@ static int __devexit bfin_i2s_soc_platform_remove(struct platform_device *pdev)
 
 static struct platform_driver bfin_i2s_pcm_driver = {
         .driver = {
-                        .name = "bfin-i2s-pcm-audio",
-                        .owner = THIS_MODULE,
+                .name = "bfin-i2s-pcm-audio",
+                .owner = THIS_MODULE,
         },
 
         .probe = bfin_i2s_soc_platform_probe,
diff --git a/sound/soc/blackfin/bf5xx-tdm-pcm.c b/sound/soc/blackfin/bf5xx-tdm-pcm.c
index 07cfc7a9e49a..c95cc03d583d 100644
--- a/sound/soc/blackfin/bf5xx-tdm-pcm.c
+++ b/sound/soc/blackfin/bf5xx-tdm-pcm.c
@@ -283,9 +283,11 @@ static void bf5xx_pcm_free_dma_buffers(struct snd_pcm *pcm)
 
 static u64 bf5xx_pcm_dmamask = DMA_BIT_MASK(32);
 
-static int bf5xx_pcm_tdm_new(struct snd_card *card, struct snd_soc_dai *dai,
-        struct snd_pcm *pcm)
+static int bf5xx_pcm_tdm_new(struct snd_soc_pcm_runtime *rtd)
 {
+        struct snd_card *card = rtd->card->snd_card;
+        struct snd_soc_dai *dai = rtd->cpu_dai;
+        struct snd_pcm *pcm = rtd->pcm;
         int ret = 0;
 
         if (!card->dev->dma_mask)
diff --git a/sound/soc/blackfin/bfin-eval-adau1701.c b/sound/soc/blackfin/bfin-eval-adau1701.c
new file mode 100644
index 000000000000..e5550acba2c2
--- /dev/null
+++ b/sound/soc/blackfin/bfin-eval-adau1701.c
@@ -0,0 +1,139 @@
+/*
+ * Machine driver for EVAL-ADAU1701MINIZ on Analog Devices bfin
+ * evaluation boards.
+ *
+ * Copyright 2011 Analog Devices Inc.
+ * Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/module.h>
+#include <linux/device.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/soc.h>
+#include <sound/pcm_params.h>
+
+#include "../codecs/adau1701.h"
+
+static const struct snd_soc_dapm_widget bfin_eval_adau1701_dapm_widgets[] = {
+        SND_SOC_DAPM_SPK("Speaker", NULL),
+        SND_SOC_DAPM_LINE("Line Out", NULL),
+        SND_SOC_DAPM_LINE("Line In", NULL),
+};
+
+static const struct snd_soc_dapm_route bfin_eval_adau1701_dapm_routes[] = {
+        { "Speaker", NULL, "OUT0" },
+        { "Speaker", NULL, "OUT1" },
+        { "Line Out", NULL, "OUT2" },
+        { "Line Out", NULL, "OUT3" },
+
+        { "IN0", NULL, "Line In" },
+        { "IN1", NULL, "Line In" },
+};
+
+static int bfin_eval_adau1701_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 *cpu_dai = rtd->cpu_dai;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
+        int ret;
+
+        ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
+                        SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);
+        if (ret)
+                return ret;
+
+        ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
+                        SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);
+        if (ret)
+                return ret;
+
+        ret = snd_soc_dai_set_sysclk(codec_dai, ADAU1701_CLK_SRC_OSC, 12288000,
+                        SND_SOC_CLOCK_IN);
+
+        return ret;
+}
+
+static struct snd_soc_ops bfin_eval_adau1701_ops = {
+        .hw_params = bfin_eval_adau1701_hw_params,
+};
+
+static struct snd_soc_dai_link bfin_eval_adau1701_dai[] = {
+        {
+                .name = "adau1701",
+                .stream_name = "adau1701",
+                .cpu_dai_name = "bfin-i2s.0",
+                .codec_dai_name = "adau1701",
+                .platform_name = "bfin-i2s-pcm-audio",
+                .codec_name = "adau1701.0-0034",
+                .ops = &bfin_eval_adau1701_ops,
+        },
+        {
+                .name = "adau1701",
+                .stream_name = "adau1701",
+                .cpu_dai_name = "bfin-i2s.1",
+                .codec_dai_name = "adau1701",
+                .platform_name = "bfin-i2s-pcm-audio",
+                .codec_name = "adau1701.0-0034",
+                .ops = &bfin_eval_adau1701_ops,
+        },
+};
+
+static struct snd_soc_card bfin_eval_adau1701 = {
+        .name = "bfin-eval-adau1701",
+        .dai_link = &bfin_eval_adau1701_dai[CONFIG_SND_BF5XX_SPORT_NUM],
+        .num_links = 1,
+
+        .dapm_widgets           = bfin_eval_adau1701_dapm_widgets,
+        .num_dapm_widgets       = ARRAY_SIZE(bfin_eval_adau1701_dapm_widgets),
+        .dapm_routes            = bfin_eval_adau1701_dapm_routes,
+        .num_dapm_routes        = ARRAY_SIZE(bfin_eval_adau1701_dapm_routes),
+};
+
+static int bfin_eval_adau1701_probe(struct platform_device *pdev)
+{
+        struct snd_soc_card *card = &bfin_eval_adau1701;
+
+        card->dev = &pdev->dev;
+
+        return snd_soc_register_card(&bfin_eval_adau1701);
+}
+
+static int __devexit bfin_eval_adau1701_remove(struct platform_device *pdev)
+{
+        struct snd_soc_card *card = platform_get_drvdata(pdev);
+
+        snd_soc_unregister_card(card);
+
+        return 0;
+}
+
+static struct platform_driver bfin_eval_adau1701_driver = {
+        .driver = {
+                .name = "bfin-eval-adau1701",
+                .owner = THIS_MODULE,
+                .pm = &snd_soc_pm_ops,
+        },
+        .probe = bfin_eval_adau1701_probe,
+        .remove = __devexit_p(bfin_eval_adau1701_remove),
+};
+
+static int __init bfin_eval_adau1701_init(void)
+{
+        return platform_driver_register(&bfin_eval_adau1701_driver);
+}
+module_init(bfin_eval_adau1701_init);
+
+static void __exit bfin_eval_adau1701_exit(void)
+{
+        platform_driver_unregister(&bfin_eval_adau1701_driver);
+}
+module_exit(bfin_eval_adau1701_exit);
+
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_DESCRIPTION("ALSA SoC bfin ADAU1701 driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:bfin-eval-adau1701");
diff --git a/sound/soc/blackfin/bfin-eval-adav80x.c b/sound/soc/blackfin/bfin-eval-adav80x.c
new file mode 100644
index 000000000000..8d014d01626e
--- /dev/null
+++ b/sound/soc/blackfin/bfin-eval-adav80x.c
@@ -0,0 +1,173 @@
+/*
+ * Machine driver for EVAL-ADAV801 and EVAL-ADAV803 on Analog Devices bfin
+ * evaluation boards.
+ *
+ * Copyright 2011 Analog Devices Inc.
+ * Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/soc.h>
+
+#include "../codecs/adav80x.h"
+
+static const struct snd_soc_dapm_widget bfin_eval_adav80x_dapm_widgets[] = {
+        SND_SOC_DAPM_LINE("Line Out", NULL),
+        SND_SOC_DAPM_LINE("Line In", NULL),
+};
+
+static const struct snd_soc_dapm_route bfin_eval_adav80x_dapm_routes[] = {
+        { "Line Out", NULL, "VOUTL" },
+        { "Line Out", NULL, "VOUTR" },
+
+        { "VINL", NULL, "Line In" },
+        { "VINR", NULL, "Line In" },
+};
+
+static int bfin_eval_adav80x_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 *cpu_dai = rtd->cpu_dai;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
+        int ret;
+
+        ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
+                        SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);
+        if (ret)
+                return ret;
+
+        ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
+                        SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);
+        if (ret)
+                return ret;
+
+        ret = snd_soc_dai_set_pll(codec_dai, ADAV80X_PLL1, ADAV80X_PLL_SRC_XTAL,
+                        27000000, params_rate(params) * 256);
+        if (ret)
+                return ret;
+
+        ret = snd_soc_dai_set_sysclk(codec_dai, ADAV80X_CLK_PLL1,
+                        params_rate(params) * 256, SND_SOC_CLOCK_IN);
+
+        return ret;
+}
+
+static int bfin_eval_adav80x_codec_init(struct snd_soc_pcm_runtime *rtd)
+{
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
+
+        snd_soc_dai_set_sysclk(codec_dai, ADAV80X_CLK_SYSCLK1, 0,
+            SND_SOC_CLOCK_OUT);
+        snd_soc_dai_set_sysclk(codec_dai, ADAV80X_CLK_SYSCLK2, 0,
+            SND_SOC_CLOCK_OUT);
+        snd_soc_dai_set_sysclk(codec_dai, ADAV80X_CLK_SYSCLK3, 0,
+            SND_SOC_CLOCK_OUT);
+
+        snd_soc_dai_set_sysclk(codec_dai, ADAV80X_CLK_XTAL, 2700000, 0);
+
+        return 0;
+}
+
+static struct snd_soc_ops bfin_eval_adav80x_ops = {
+        .hw_params = bfin_eval_adav80x_hw_params,
+};
+
+static struct snd_soc_dai_link bfin_eval_adav80x_dais[] = {
+        {
+                .name = "adav80x",
+                .stream_name = "ADAV80x HiFi",
+                .cpu_dai_name = "bfin-i2s.0",
+                .codec_dai_name = "adav80x-hifi",
+                .platform_name = "bfin-i2s-pcm-audio",
+                .init = bfin_eval_adav80x_codec_init,
+                .ops = &bfin_eval_adav80x_ops,
+        },
+};
+
+static struct snd_soc_card bfin_eval_adav80x = {
+        .name = "bfin-eval-adav80x",
+        .dai_link = bfin_eval_adav80x_dais,
+        .num_links = ARRAY_SIZE(bfin_eval_adav80x_dais),
+
+        .dapm_widgets           = bfin_eval_adav80x_dapm_widgets,
+        .num_dapm_widgets       = ARRAY_SIZE(bfin_eval_adav80x_dapm_widgets),
+        .dapm_routes            = bfin_eval_adav80x_dapm_routes,
+        .num_dapm_routes        = ARRAY_SIZE(bfin_eval_adav80x_dapm_routes),
+};
+
+enum bfin_eval_adav80x_type {
+        BFIN_EVAL_ADAV801,
+        BFIN_EVAL_ADAV803,
+};
+
+static int bfin_eval_adav80x_probe(struct platform_device *pdev)
+{
+        struct snd_soc_card *card = &bfin_eval_adav80x;
+        const char *codec_name;
+
+        switch (platform_get_device_id(pdev)->driver_data) {
+        case BFIN_EVAL_ADAV801:
+                codec_name = "spi0.1";
+                break;
+        case BFIN_EVAL_ADAV803:
+                codec_name = "adav803.0-0034";
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        bfin_eval_adav80x_dais[0].codec_name = codec_name;
+
+        card->dev = &pdev->dev;
+
+        return snd_soc_register_card(&bfin_eval_adav80x);
+}
+
+static int __devexit bfin_eval_adav80x_remove(struct platform_device *pdev)
+{
+        struct snd_soc_card *card = platform_get_drvdata(pdev);
+
+        snd_soc_unregister_card(card);
+
+        return 0;
+}
+
+static const struct platform_device_id bfin_eval_adav80x_ids[] = {
+        { "bfin-eval-adav801", BFIN_EVAL_ADAV801 },
+        { "bfin-eval-adav803", BFIN_EVAL_ADAV803 },
+        { },
+};
+MODULE_DEVICE_TABLE(platform, bfin_eval_adav80x_ids);
+
+static struct platform_driver bfin_eval_adav80x_driver = {
+        .driver = {
+                .name = "bfin-eval-adav80x",
+                .owner = THIS_MODULE,
+                .pm = &snd_soc_pm_ops,
+        },
+        .probe = bfin_eval_adav80x_probe,
+        .remove = __devexit_p(bfin_eval_adav80x_remove),
+        .id_table = bfin_eval_adav80x_ids,
+};
+
+static int __init bfin_eval_adav80x_init(void)
+{
+        return platform_driver_register(&bfin_eval_adav80x_driver);
+}
+module_init(bfin_eval_adav80x_init);
+
+static void __exit bfin_eval_adav80x_exit(void)
+{
+        platform_driver_unregister(&bfin_eval_adav80x_driver);
+}
+module_exit(bfin_eval_adav80x_exit);
+
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_DESCRIPTION("ALSA SoC bfin adav80x driver");
+MODULE_LICENSE("GPL");