From: richard.genoud@gmail.com (Richard Genoud)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 1/5] sound: sam9x5_wm8731: machine driver for at91sam9x5 wm8731 boards
Date: Mon, 8 Jul 2013 15:29:49 +0200 [thread overview]
Message-ID: <1373290193-25300-2-git-send-email-richard.genoud@gmail.com> (raw)
In-Reply-To: <1373290193-25300-1-git-send-email-richard.genoud@gmail.com>
From: Nicolas Ferre <nicolas.ferre@atmel.com>
Description of the Asoc machine driver for an at91sam9x5 based board
with a wm8731 audio DAC. Wm8731 is clocked by a crystal and used as a
master on the SSC/I2S interface. Its connections are a headphone jack
and an Line input jack.
[Richard: this is based on an old patch from Nicolas that I forward
ported and reworked to use only device tree]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
---
sound/soc/atmel/Kconfig | 10 ++
sound/soc/atmel/Makefile | 2 +
sound/soc/atmel/sam9x5_wm8731.c | 206 +++++++++++++++++++++++++++++++++++++++
3 files changed, 218 insertions(+)
create mode 100644 sound/soc/atmel/sam9x5_wm8731.c
diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig
index 1c0b185..9eb8c49 100644
--- a/sound/soc/atmel/Kconfig
+++ b/sound/soc/atmel/Kconfig
@@ -33,6 +33,16 @@ config SND_AT91_SOC_SAM9G20_WM8731
Say Y if you want to add support for SoC audio on WM8731-based
AT91sam9g20 evaluation board.
+config SND_AT91_SOC_SAM9X5_WM8731
+ tristate "SoC Audio support for WM8731-based at91sam9x5 board"
+ depends on ATMEL_SSC && SND_ATMEL_SOC && SOC_AT91SAM9X5
+ select SND_ATMEL_SOC_SSC
+ select SND_ATMEL_SOC_DMA
+ select SND_SOC_WM8731
+ help
+ Say Y if you want to add support for audio SoC on an
+ at91sam9x5 based board that is using WM8731 codec.
+
config SND_AT91_SOC_AFEB9260
tristate "SoC Audio support for AFEB9260 board"
depends on ARCH_AT91 && ATMEL_SSC && ARCH_AT91 && MACH_AFEB9260 && SND_ATMEL_SOC
diff --git a/sound/soc/atmel/Makefile b/sound/soc/atmel/Makefile
index 41967cc..7784c09 100644
--- a/sound/soc/atmel/Makefile
+++ b/sound/soc/atmel/Makefile
@@ -11,6 +11,8 @@ obj-$(CONFIG_SND_ATMEL_SOC_SSC) += snd-soc-atmel_ssc_dai.o
# AT91 Machine Support
snd-soc-sam9g20-wm8731-objs := sam9g20_wm8731.o
+snd-soc-sam9x5-wm8731-objs := sam9x5_wm8731.o
obj-$(CONFIG_SND_AT91_SOC_SAM9G20_WM8731) += snd-soc-sam9g20-wm8731.o
+obj-$(CONFIG_SND_AT91_SOC_SAM9X5_WM8731) += snd-soc-sam9x5-wm8731.o
obj-$(CONFIG_SND_AT91_SOC_AFEB9260) += snd-soc-afeb9260.o
diff --git a/sound/soc/atmel/sam9x5_wm8731.c b/sound/soc/atmel/sam9x5_wm8731.c
new file mode 100644
index 0000000..3e5a9f6
--- /dev/null
+++ b/sound/soc/atmel/sam9x5_wm8731.c
@@ -0,0 +1,206 @@
+/*
+ * sam9x5_wm8731 -- SoC audio for AT91SAM9X5-based boards
+ * that are using WM8731 as codec.
+ *
+ * Copyright (C) 2011 Atmel,
+ * Nicolas Ferre <nicolas.ferre@atmel.com>
+ *
+ * Based on sam9g20_wm8731.c by:
+ * Sedji Gaouaou <sedji.gaouaou@atmel.com>
+ *
+ * GPL
+ */
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/kernel.h>
+#include <linux/clk.h>
+#include <linux/timer.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <linux/i2c.h>
+
+#include <linux/atmel-ssc.h>
+
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+
+#include <asm/mach-types.h>
+#include <mach/hardware.h>
+#include <mach/gpio.h>
+
+#include "../codecs/wm8731.h"
+#include "atmel-pcm.h"
+#include "atmel_ssc_dai.h"
+
+#define MCLK_RATE 12288000
+
+#define DRV_NAME "sam9x5-snd-wm8731"
+
+/*
+ * Logic for a wm8731 as connected on a at91sam9x5 based board.
+ */
+static int at91sam9x5ek_wm8731_init(struct snd_soc_pcm_runtime *rtd)
+{
+ struct snd_soc_codec *codec = rtd->codec;
+ struct snd_soc_dai *codec_dai = rtd->codec_dai;
+ struct snd_soc_dapm_context *dapm = &codec->dapm;
+ struct device *dev = rtd->dev;
+ int ret;
+
+ dev_dbg(dev, "ASoC: %s called\n", __func__);
+
+ codec_dai->driver->playback.rates &= SNDRV_PCM_RATE_8000 |
+ SNDRV_PCM_RATE_32000 |
+ SNDRV_PCM_RATE_48000 |
+ SNDRV_PCM_RATE_96000;
+ codec_dai->driver->capture.rates &= SNDRV_PCM_RATE_8000 |
+ SNDRV_PCM_RATE_32000 |
+ SNDRV_PCM_RATE_48000 |
+ SNDRV_PCM_RATE_96000;
+
+ /* set the codec system clock for DAC and ADC */
+ ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL,
+ MCLK_RATE, SND_SOC_CLOCK_IN);
+ if (ret < 0) {
+ dev_err(dev, "ASoC: Failed to set WM8731 SYSCLK: %d\n", ret);
+ return ret;
+ }
+
+ /* signal a DAPM event */
+ snd_soc_dapm_sync(dapm);
+ return 0;
+}
+
+/*
+ * Audio paths on at91sam9x5ek board:
+ *
+ * |A| ------------> | | ---R----> Headphone Jack
+ * |T| <----\ | WM | ---L--/
+ * |9| ---> CLK <--> | 8751 | <--R----- Line In Jack
+ * |1| <------------ | | <--L--/
+ */
+static const struct snd_soc_dapm_widget at91sam9x5ek_dapm_widgets[] = {
+ SND_SOC_DAPM_HP("Headphone Jack", NULL),
+ SND_SOC_DAPM_LINE("Line In Jack", NULL),
+};
+
+static struct snd_soc_dai_link at91sam9x5ek_dai = {
+ .name = "WM8731",
+ .stream_name = "WM8731 PCM",
+ .codec_dai_name = "wm8731-hifi",
+ .init = at91sam9x5ek_wm8731_init,
+};
+
+static struct snd_soc_card snd_soc_at91sam9x5ek = {
+ .owner = THIS_MODULE,
+ .dai_link = &at91sam9x5ek_dai,
+ .num_links = 1,
+ .dapm_widgets = at91sam9x5ek_dapm_widgets,
+ .num_dapm_widgets = ARRAY_SIZE(at91sam9x5ek_dapm_widgets),
+};
+
+static int sam9x5_wm8731_driver_probe(struct platform_device *pdev)
+{
+ struct device_node *np = pdev->dev.of_node;
+ struct device_node *codec_np, *cpu_np;
+ int ret;
+
+ if (!np) {
+ dev_err(&pdev->dev, "No device node supplied\n");
+ return -EINVAL;
+ }
+
+ ret = atmel_ssc_set_audio(0);
+ if (ret != 0) {
+ dev_err(&pdev->dev,
+ "ASoC: Failed to set SSC 0 for audio: %d\n", ret);
+ return ret;
+ }
+
+ snd_soc_at91sam9x5ek.dev = &pdev->dev;
+
+ ret = snd_soc_of_parse_card_name(&snd_soc_at91sam9x5ek, "atmel,model");
+ if (ret)
+ goto out;
+
+ ret = snd_soc_of_parse_audio_routing(&snd_soc_at91sam9x5ek,
+ "atmel,audio-routing");
+ if (ret)
+ goto out;
+
+ codec_np = of_parse_phandle(np, "atmel,audio-codec", 0);
+ if (!codec_np) {
+ dev_err(&pdev->dev, "codec info missing\n");
+ ret = -EINVAL;
+ goto out;
+ }
+
+ at91sam9x5ek_dai.codec_of_node = codec_np;
+
+ cpu_np = of_parse_phandle(np, "atmel,ssc-controller", 0);
+ if (!cpu_np) {
+ dev_err(&pdev->dev, "ssc controller node missing\n");
+ ret = -EINVAL;
+ goto out;
+ }
+ at91sam9x5ek_dai.cpu_of_node = cpu_np;
+ at91sam9x5ek_dai.platform_of_node = cpu_np;
+
+ of_node_put(codec_np);
+ of_node_put(cpu_np);
+
+ at91sam9x5ek_dai.dai_fmt = snd_soc_of_parse_daifmt(np, "atmel,");
+
+ ret = snd_soc_register_card(&snd_soc_at91sam9x5ek);
+ if (ret) {
+ dev_err(&pdev->dev,
+ "ASoC: Platform device allocation failed\n");
+ goto out;
+ }
+
+ platform_set_drvdata(pdev, &snd_soc_at91sam9x5ek);
+
+ dev_dbg(&pdev->dev, "ASoC: %s ok\n", __func__);
+
+ return ret;
+
+out:
+ atmel_ssc_put_audio(0);
+ return ret;
+}
+
+static int sam9x5_wm8731_driver_remove(struct platform_device *pdev)
+{
+ struct snd_soc_card *card = platform_get_drvdata(pdev);
+
+ snd_soc_unregister_card(card);
+ atmel_ssc_put_audio(0);
+
+ return 0;
+}
+
+static const struct of_device_id sam9x5_wm8731_of_match[] = {
+ { .compatible = "atmel,sam9x5-audio-wm8731", },
+ {},
+};
+MODULE_DEVICE_TABLE(of, sam9x5_wm8731_of_match);
+
+static struct platform_driver sam9x5_wm8731_driver = {
+ .driver = {
+ .name = DRV_NAME,
+ .owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(sam9x5_wm8731_of_match),
+ },
+ .probe = sam9x5_wm8731_driver_probe,
+ .remove = sam9x5_wm8731_driver_remove,
+};
+module_platform_driver(sam9x5_wm8731_driver);
+
+/* Module information */
+MODULE_AUTHOR("Nicolas Ferre <nicolas.ferre@atmel.com>");
+MODULE_AUTHOR("Richard Genoud <richard.genoud@gmail.com>");
+MODULE_DESCRIPTION("ALSA SoC machine driver for AT91SAM9x5 - WM8731");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:" DRV_NAME);
--
1.7.10.4
next prev parent reply other threads:[~2013-07-08 13:29 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-08 13:29 [PATCH v2 0/5] Sound support for at91sam9x5-wm8731 based boards Richard Genoud
2013-07-08 13:29 ` Richard Genoud [this message]
2013-07-08 14:39 ` [alsa-devel] [PATCH v2 1/5] sound: sam9x5_wm8731: machine driver for at91sam9x5 wm8731 boards Lars-Peter Clausen
2013-07-09 7:37 ` Richard Genoud
2013-07-08 15:07 ` Mark Brown
2013-07-09 8:19 ` Richard Genoud
2013-07-09 8:37 ` Bo Shen
2013-07-09 9:29 ` Mark Brown
2013-07-09 10:27 ` Richard Genoud
2013-07-08 13:29 ` [PATCH v2 2/5] ARM: AT91: DTS: sam9x5: add SSC DMA parameters Richard Genoud
2013-07-08 15:07 ` Mark Brown
2013-07-09 8:27 ` Richard Genoud
2013-07-09 9:32 ` Mark Brown
2013-07-09 9:46 ` Richard Genoud
2013-07-08 13:29 ` [PATCH v2 3/5] ARM: AT91: DTS: sam9x5ek: add WM8731 codec Richard Genoud
2013-07-08 14:36 ` [alsa-devel] " Mark Brown
2013-07-08 13:29 ` [PATCH v2 4/5] ARM: AT91: DTS: sam9x5ek: add sound configuration Richard Genoud
2013-07-08 13:29 ` [PATCH v2 5/5] ARM: AT91: DTS: sam9x5ek: enable SSC Richard Genoud
2013-07-08 13:53 ` [PATCH v2 0/5] Sound support for at91sam9x5-wm8731 based boards Nicolas Ferre
2013-07-09 12:28 ` [PATCH v3 0/7] " Richard Genoud
2013-07-09 12:28 ` [PATCH v3 1/7] sound: sam9x5_wm8731: machine driver for at91sam9x5 wm8731 boards Richard Genoud
2013-07-09 12:28 ` [PATCH v3 2/7] Documentation: DT: add sam9x5ek-wm8731 machine driver Richard Genoud
2013-07-09 12:28 ` [PATCH v3 3/7] Documentation: DT: update atmel SSC with DMA binding Richard Genoud
2013-07-09 13:19 ` Richard Genoud
2013-07-09 13:20 ` Nicolas Ferre
2013-07-09 13:31 ` Richard Genoud
2013-07-09 12:28 ` [PATCH v3 4/7] ARM: AT91: DTS: sam9x5: add SSC DMA parameters Richard Genoud
2013-07-09 12:28 ` [PATCH v3 5/7] ARM: AT91: DTS: sam9x5ek: add WM8731 codec Richard Genoud
2013-07-09 12:28 ` [PATCH v3 6/7] ARM: AT91: DTS: sam9x5ek: add sound configuration Richard Genoud
2013-07-09 12:28 ` [PATCH v3 7/7] ARM: AT91: DTS: sam9x5ek: enable SSC Richard Genoud
2013-07-09 14:25 ` [PATCH v4 0/7] Sound support for at91sam9x5-wm8731 based boards Richard Genoud
2013-07-09 14:25 ` [PATCH v4 1/7] sound: sam9x5_wm8731: machine driver for at91sam9x5 wm8731 boards Richard Genoud
2013-07-09 14:59 ` Mark Brown
2013-07-10 9:25 ` Richard Genoud
2013-07-10 10:00 ` Mark Brown
2013-07-10 6:11 ` Bo Shen
2013-07-10 9:30 ` Richard Genoud
2013-07-09 14:25 ` [PATCH v4 2/7] Documentation: DT: add sam9x5ek-wm8731 machine driver Richard Genoud
2013-07-09 15:01 ` Mark Brown
2013-07-10 9:32 ` Richard Genoud
2013-07-09 14:25 ` [PATCH v4 3/7] Documentation: DT: update atmel SSC with DMA binding Richard Genoud
2013-07-09 15:05 ` Mark Brown
2013-07-10 9:48 ` Richard Genoud
2013-07-10 10:01 ` Mark Brown
2013-07-09 14:25 ` [PATCH v4 4/7] ARM: AT91: DTS: sam9x5: add SSC DMA parameters Richard Genoud
2013-07-09 14:25 ` [PATCH v4 5/7] ARM: AT91: DTS: sam9x5ek: add WM8731 codec Richard Genoud
2013-07-09 14:25 ` [PATCH v4 6/7] ARM: AT91: DTS: sam9x5ek: add sound configuration Richard Genoud
2013-07-09 14:25 ` [PATCH v4 7/7] ARM: AT91: DTS: sam9x5ek: enable SSC Richard Genoud
2013-07-09 14:42 ` [PATCH v4 0/7] Sound support for at91sam9x5-wm8731 based boards Mark Brown
2013-07-09 14:52 ` Richard Genoud
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1373290193-25300-2-git-send-email-richard.genoud@gmail.com \
--to=richard.genoud@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).