ASoC: Samsung: Add arndale_rt5631 machine driver and binding

Adding machine driver to instantiate I2S based realtek's ALC5631
sound card on Arndale board.

There are other variants of Audio Daughter Cards for Arndale
Board for which support already exists but there is no support for
Realtek's alc5631 codec hence support for ALC5631 based machine
driver is being added.
This patch also documents the device tree binding for the Arndale
board based machine driver.

Signed-off-by: Claude Youn <claude.youn@gmail.com>
Signed-off-by: Krishna Mohan Dani <krishna.md@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/Documentation/devicetree/bindings/sound/arndale.txt b/Documentation/devicetree/bindings/sound/arndale.txt
new file mode 100644 (file)
index 0000000..0e76946
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/arndale.txt
@@ -0,0 +1,24 @@
+Audio Binding for Arndale boards
+
+Required properties:
+- compatible : Can be the following,
+                       "samsung,arndale-rt5631"
+
+- samsung,audio-cpu: The phandle of the Samsung I2S controller
+- samsung,audio-codec: The phandle of the audio codec
+
+Optional:
+- samsung,model: The name of the sound-card
+
+Arndale Boards has many audio daughter cards, one of them is
+rt5631/alc5631. Below example shows audio bindings for rt5631/
+alc5631 based codec.
+
+Example:
+
+sound {
+               compatible = "samsung,arndale-rt5631";
+
+               samsung,audio-cpu = <&i2s0>
+               samsung,audio-codec = <&rt5631>;
+};

diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index e0e737faadd932d3fb15ce6306f19c37c81333eb..fc67f97f19f6338bdc01ddded64310181edcfc75 100644 (file)
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -239,3 +239,9 @@ config SND_SOC_ODROIDX2
        select SND_SAMSUNG_I2S
        help
          Say Y here to enable audio support for the Odroid-X2/U3.
+
+config SND_SOC_ARNDALE_RT5631_ALC5631
+        tristate "Audio support for RT5631(ALC5631) on Arndale Board"
+        depends on SND_SOC_SAMSUNG
+        select SND_SAMSUNG_I2S
+        select SND_SOC_RT5631

diff --git a/sound/soc/samsung/Makefile b/sound/soc/samsung/Makefile
index 91505ddaaf9593b4a748179ae6f6debf7a0359ff..31e3dba7e3b58d8bc623b245663e22dbbd67af6e 100644 (file)
--- a/sound/soc/samsung/Makefile
+++ b/sound/soc/samsung/Makefile
@@ -45,6 +45,7 @@ snd-soc-lowland-objs := lowland.o
 snd-soc-littlemill-objs := littlemill.o
 snd-soc-bells-objs := bells.o
 snd-soc-odroidx2-max98090-objs := odroidx2_max98090.o
+snd-soc-arndale-rt5631-objs := arndale_rt5631.o
 
 obj-$(CONFIG_SND_SOC_SAMSUNG_JIVE_WM8750) += snd-soc-jive-wm8750.o
 obj-$(CONFIG_SND_SOC_SAMSUNG_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o
@@ -71,3 +72,4 @@ obj-$(CONFIG_SND_SOC_LOWLAND) += snd-soc-lowland.o
 obj-$(CONFIG_SND_SOC_LITTLEMILL) += snd-soc-littlemill.o
 obj-$(CONFIG_SND_SOC_BELLS) += snd-soc-bells.o
 obj-$(CONFIG_SND_SOC_ODROIDX2) += snd-soc-odroidx2-max98090.o
+obj-$(CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631) += snd-soc-arndale-rt5631.o

diff --git a/sound/soc/samsung/arndale_rt5631.c b/sound/soc/samsung/arndale_rt5631.c
new file mode 100644 (file)
index 0000000..1e2b61c
--- /dev/null
+++ b/sound/soc/samsung/arndale_rt5631.c
@@ -0,0 +1,150 @@
+/*
+ *  arndale_rt5631.c
+ *
+ *  Copyright (c) 2014, Insignal Co., Ltd.
+ *
+ *  Author: Claude <claude@insginal.co.kr>
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+
+#include "i2s.h"
+
+static int arndale_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 rfs, ret;
+       unsigned long rclk;
+
+       rfs = 256;
+
+       rclk = params_rate(params) * rfs;
+
+       ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_CDCLK,
+                                       0, SND_SOC_CLOCK_OUT);
+       if (ret < 0)
+               return ret;
+
+       ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_RCLKSRC_0,
+                                       0, SND_SOC_CLOCK_OUT);
+
+       if (ret < 0)
+               return ret;
+
+       ret = snd_soc_dai_set_sysclk(codec_dai, 0, rclk, SND_SOC_CLOCK_OUT);
+       if (ret < 0)
+               return ret;
+
+       return 0;
+}
+
+static struct snd_soc_ops arndale_ops = {
+       .hw_params = arndale_hw_params,
+};
+
+static struct snd_soc_dai_link arndale_rt5631_dai[] = {
+       {
+               .name = "RT5631 HiFi",
+               .stream_name = "Primary",
+               .codec_dai_name = "rt5631-hifi",
+               .dai_fmt = SND_SOC_DAIFMT_I2S
+                       | SND_SOC_DAIFMT_NB_NF
+                       | SND_SOC_DAIFMT_CBS_CFS,
+               .ops = &arndale_ops,
+       },
+};
+
+static struct snd_soc_card arndale_rt5631 = {
+       .name = "Arndale RT5631",
+       .dai_link = arndale_rt5631_dai,
+       .num_links = ARRAY_SIZE(arndale_rt5631_dai),
+};
+
+static int arndale_audio_probe(struct platform_device *pdev)
+{
+       int n, ret;
+       struct device_node *np = pdev->dev.of_node;
+       struct snd_soc_card *card = &arndale_rt5631;
+
+       card->dev = &pdev->dev;
+
+       for (n = 0; np && n < ARRAY_SIZE(arndale_rt5631_dai); n++) {
+               if (!arndale_rt5631_dai[n].cpu_dai_name) {
+                       arndale_rt5631_dai[n].cpu_of_node = of_parse_phandle(np,
+                                       "samsung,audio-cpu", n);
+
+                       if (!arndale_rt5631_dai[n].cpu_of_node) {
+                               dev_err(&pdev->dev,
+                               "Property 'samsung,audio-cpu' missing or invalid\n");
+                               return -EINVAL;
+                       }
+               }
+               if (!arndale_rt5631_dai[n].platform_name)
+                       arndale_rt5631_dai[n].platform_of_node =
+                                       arndale_rt5631_dai[n].cpu_of_node;
+
+               arndale_rt5631_dai[n].codec_name = NULL;
+               arndale_rt5631_dai[n].codec_of_node = of_parse_phandle(np,
+                                       "samsung,audio-codec", n);
+               if (!arndale_rt5631_dai[0].codec_of_node) {
+                       dev_err(&pdev->dev,
+                       "Property 'samsung,audio-codec' missing or invalid\n");
+                       return -EINVAL;
+               }
+       }
+
+       ret = devm_snd_soc_register_card(card->dev, card);
+
+       if (ret)
+               dev_err(&pdev->dev, "snd_soc_register_card() failed:%d\n", ret);
+
+       return ret;
+}
+
+static int arndale_audio_remove(struct platform_device *pdev)
+{
+       struct snd_soc_card *card = platform_get_drvdata(pdev);
+
+       snd_soc_unregister_card(card);
+
+       return 0;
+}
+
+static const struct of_device_id samsung_arndale_rt5631_of_match[] __maybe_unused = {
+       { .compatible = "samsung,arndale-rt5631", },
+       { .compatible = "samsung,arndale-alc5631", },
+       {},
+};
+MODULE_DEVICE_TABLE(of, samsung_arndale_rt5631_of_match);
+
+static struct platform_driver arndale_audio_driver = {
+       .driver = {
+               .name   = "arndale-audio",
+               .owner  = THIS_MODULE,
+               .pm = &snd_soc_pm_ops,
+               .of_match_table = of_match_ptr(samsung_arndale_rt5631_of_match),
+       },
+       .probe = arndale_audio_probe,
+       .remove = arndale_audio_remove,
+};
+
+module_platform_driver(arndale_audio_driver);
+
+MODULE_AUTHOR("Claude <claude@insignal.co.kr>");
+MODULE_DESCRIPTION("ALSA SoC Driver for Arndale Board");
+MODULE_LICENSE("GPL");