123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275 |
- From 29c1cff5d670cc4f22eed035c6e584aec967c1b6 Mon Sep 17 00:00:00 2001
- From: Florian Meier <florian.meier@koalo.de>
- Date: Fri, 22 Nov 2013 19:21:34 +0100
- Subject: [PATCH] ASoC: Add support for Rpi-DAC
- ---
- sound/soc/bcm/Kconfig | 7 +++
- sound/soc/bcm/Makefile | 2 +
- sound/soc/bcm/rpi-dac.c | 118 ++++++++++++++++++++++++++++++++++++++++++++
- sound/soc/codecs/Kconfig | 9 ++++
- sound/soc/codecs/Makefile | 2 +
- sound/soc/codecs/pcm1794a.c | 69 ++++++++++++++++++++++++++
- 6 files changed, 207 insertions(+)
- create mode 100644 sound/soc/bcm/rpi-dac.c
- create mode 100644 sound/soc/codecs/pcm1794a.c
- --- a/sound/soc/bcm/Kconfig
- +++ b/sound/soc/bcm/Kconfig
- @@ -14,3 +14,10 @@ config SND_BCM2708_SOC_HIFIBERRY_DAC
- select SND_SOC_PCM5102A
- help
- Say Y or M if you want to add support for HifiBerry DAC.
- +
- +config SND_BCM2708_SOC_RPI_DAC
- + tristate "Support for RPi-DAC"
- + depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- + select SND_SOC_PCM1794A
- + help
- + Say Y or M if you want to add support for RPi-DAC.
- --- a/sound/soc/bcm/Makefile
- +++ b/sound/soc/bcm/Makefile
- @@ -5,5 +5,7 @@ obj-$(CONFIG_SND_BCM2835_SOC_I2S) += snd
-
- # BCM2708 Machine Support
- snd-soc-hifiberry-dac-objs := hifiberry_dac.o
- +snd-soc-rpi-dac-objs := rpi-dac.o
-
- obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC) += snd-soc-hifiberry-dac.o
- +obj-$(CONFIG_SND_BCM2708_SOC_RPI_DAC) += snd-soc-rpi-dac.o
- --- /dev/null
- +++ b/sound/soc/bcm/rpi-dac.c
- @@ -0,0 +1,118 @@
- +/*
- + * ASoC Driver for RPi-DAC.
- + *
- + * Author: Florian Meier <florian.meier@koalo.de>
- + * Copyright 2013
- + *
- + * 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.
- + *
- + * This program is distributed in the hope that it will be useful, but
- + * WITHOUT ANY WARRANTY; without even the implied warranty of
- + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- + * General Public License for more details.
- + */
- +
- +#include <linux/module.h>
- +#include <linux/platform_device.h>
- +
- +#include <sound/core.h>
- +#include <sound/pcm.h>
- +#include <sound/pcm_params.h>
- +#include <sound/soc.h>
- +#include <sound/jack.h>
- +
- +static int snd_rpi_rpi_dac_init(struct snd_soc_pcm_runtime *rtd)
- +{
- + return 0;
- +}
- +
- +static int snd_rpi_rpi_dac_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;
- +
- + return snd_soc_dai_set_bclk_ratio(cpu_dai, 32*2);
- +}
- +
- +/* machine stream operations */
- +static struct snd_soc_ops snd_rpi_rpi_dac_ops = {
- + .hw_params = snd_rpi_rpi_dac_hw_params,
- +};
- +
- +static struct snd_soc_dai_link snd_rpi_rpi_dac_dai[] = {
- +{
- + .name = "RPi-DAC",
- + .stream_name = "RPi-DAC HiFi",
- + .cpu_dai_name = "bcm2708-i2s.0",
- + .codec_dai_name = "pcm1794a-hifi",
- + .platform_name = "bcm2708-i2s.0",
- + .codec_name = "pcm1794a-codec",
- + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
- + SND_SOC_DAIFMT_CBS_CFS,
- + .ops = &snd_rpi_rpi_dac_ops,
- + .init = snd_rpi_rpi_dac_init,
- +},
- +};
- +
- +/* audio machine driver */
- +static struct snd_soc_card snd_rpi_rpi_dac = {
- + .name = "snd_rpi_rpi_dac",
- + .dai_link = snd_rpi_rpi_dac_dai,
- + .num_links = ARRAY_SIZE(snd_rpi_rpi_dac_dai),
- +};
- +
- +static int snd_rpi_rpi_dac_probe(struct platform_device *pdev)
- +{
- + int ret = 0;
- +
- + snd_rpi_rpi_dac.dev = &pdev->dev;
- +
- + if (pdev->dev.of_node) {
- + struct device_node *i2s_node;
- + struct snd_soc_dai_link *dai = &snd_rpi_rpi_dac_dai[0];
- + i2s_node = of_parse_phandle(pdev->dev.of_node, "i2s-controller", 0);
- +
- + if (i2s_node) {
- + dai->cpu_dai_name = NULL;
- + dai->cpu_of_node = i2s_node;
- + dai->platform_name = NULL;
- + dai->platform_of_node = i2s_node;
- + }
- + }
- +
- + ret = snd_soc_register_card(&snd_rpi_rpi_dac);
- + if (ret)
- + dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret);
- +
- + return ret;
- +}
- +
- +static int snd_rpi_rpi_dac_remove(struct platform_device *pdev)
- +{
- + return snd_soc_unregister_card(&snd_rpi_rpi_dac);
- +}
- +
- +static const struct of_device_id snd_rpi_rpi_dac_of_match[] = {
- + { .compatible = "rpi,rpi-dac", },
- + {},
- +};
- +MODULE_DEVICE_TABLE(of, snd_rpi_rpi_dac_of_match);
- +
- +static struct platform_driver snd_rpi_rpi_dac_driver = {
- + .driver = {
- + .name = "snd-rpi-dac",
- + .owner = THIS_MODULE,
- + .of_match_table = snd_rpi_rpi_dac_of_match,
- + },
- + .probe = snd_rpi_rpi_dac_probe,
- + .remove = snd_rpi_rpi_dac_remove,
- +};
- +
- +module_platform_driver(snd_rpi_rpi_dac_driver);
- +
- +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
- +MODULE_DESCRIPTION("ASoC Driver for RPi-DAC");
- +MODULE_LICENSE("GPL v2");
- --- a/sound/soc/codecs/Kconfig
- +++ b/sound/soc/codecs/Kconfig
- @@ -90,6 +90,7 @@ config SND_SOC_ALL_CODECS
- select SND_SOC_RT286 if I2C
- select SND_SOC_RT298 if I2C
- select SND_SOC_PCM5102A if I2C
- + select SND_SOC_PCM1794A if I2C
- select SND_SOC_RT5631 if I2C
- select SND_SOC_RT5640 if I2C
- select SND_SOC_RT5645 if I2C
- @@ -550,6 +551,14 @@ config SND_SOC_RT298
- tristate
- depends on I2C
-
- +config SND_SOC_RT298
- + tristate
- + depends on I2C
- +
- +config SND_SOC_PCM1794A
- + tristate
- + depends on I2C
- +
- config SND_SOC_PCM5102A
- tristate
- depends on I2C
- --- a/sound/soc/codecs/Makefile
- +++ b/sound/soc/codecs/Makefile
- @@ -85,6 +85,7 @@ snd-soc-rl6231-objs := rl6231.o
- snd-soc-rl6347a-objs := rl6347a.o
- snd-soc-rt286-objs := rt286.o
- snd-soc-rt298-objs := rt298.o
- +snd-soc-pcm1794a-objs := pcm1794a.o
- snd-soc-pcm5102a-objs := pcm5102a.o
- snd-soc-rt5631-objs := rt5631.o
- snd-soc-rt5640-objs := rt5640.o
- @@ -281,6 +282,7 @@ obj-$(CONFIG_SND_SOC_RL6231) += snd-soc-
- obj-$(CONFIG_SND_SOC_RL6347A) += snd-soc-rl6347a.o
- obj-$(CONFIG_SND_SOC_RT286) += snd-soc-rt286.o
- obj-$(CONFIG_SND_SOC_RT298) += snd-soc-rt298.o
- +obj-$(CONFIG_SND_SOC_PCM1794A) += snd-soc-pcm1794a.o
- obj-$(CONFIG_SND_SOC_PCM5102A) += snd-soc-pcm5102a.o
- obj-$(CONFIG_SND_SOC_RT5631) += snd-soc-rt5631.o
- obj-$(CONFIG_SND_SOC_RT5640) += snd-soc-rt5640.o
- --- /dev/null
- +++ b/sound/soc/codecs/pcm1794a.c
- @@ -0,0 +1,69 @@
- +/*
- + * Driver for the PCM1794A codec
- + *
- + * Author: Florian Meier <florian.meier@koalo.de>
- + * Copyright 2013
- + *
- + * 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.
- + *
- + * This program is distributed in the hope that it will be useful, but
- + * WITHOUT ANY WARRANTY; without even the implied warranty of
- + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- + * General Public License for more details.
- + */
- +
- +
- +#include <linux/init.h>
- +#include <linux/module.h>
- +#include <linux/platform_device.h>
- +
- +#include <sound/soc.h>
- +
- +static struct snd_soc_dai_driver pcm1794a_dai = {
- + .name = "pcm1794a-hifi",
- + .playback = {
- + .channels_min = 2,
- + .channels_max = 2,
- + .rates = SNDRV_PCM_RATE_8000_192000,
- + .formats = SNDRV_PCM_FMTBIT_S16_LE |
- + SNDRV_PCM_FMTBIT_S24_LE
- + },
- +};
- +
- +static struct snd_soc_codec_driver soc_codec_dev_pcm1794a;
- +
- +static int pcm1794a_probe(struct platform_device *pdev)
- +{
- + return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_pcm1794a,
- + &pcm1794a_dai, 1);
- +}
- +
- +static int pcm1794a_remove(struct platform_device *pdev)
- +{
- + snd_soc_unregister_codec(&pdev->dev);
- + return 0;
- +}
- +
- +static const struct of_device_id pcm1794a_of_match[] = {
- + { .compatible = "ti,pcm1794a", },
- + { }
- +};
- +MODULE_DEVICE_TABLE(of, pcm1794a_of_match);
- +
- +static struct platform_driver pcm1794a_codec_driver = {
- + .probe = pcm1794a_probe,
- + .remove = pcm1794a_remove,
- + .driver = {
- + .name = "pcm1794a-codec",
- + .owner = THIS_MODULE,
- + .of_match_table = of_match_ptr(pcm1794a_of_match),
- + },
- +};
- +
- +module_platform_driver(pcm1794a_codec_driver);
- +
- +MODULE_DESCRIPTION("ASoC PCM1794A codec driver");
- +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
- +MODULE_LICENSE("GPL v2");
|