raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

ASoC: BCM2708: Add support for RPi-DAC

Browse Source 
This adds a machine driver for the RPi-DAC.

Signed-off-by: Florian Meier <florian.meier@koalo.de>
This commit is contained in:
Florian Meier
2013-12-06 20:50:28 +01:00
committed by popcornmix
parent 251ca1c8fb
commit 0321000771
7 changed files with 193 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
arch/arm/mach-bcm2708/bcm2708.c
View File

@@ -652,6 +652,20 @@ static struct platform_device snd_pcm5102a_codec_device = {
};
#endif
#if defined(CONFIG_SND_BCM2708_SOC_RPI_DAC) || defined(CONFIG_SND_BCM2708_SOC_RPI_DAC_MODULE)
static struct platform_device snd_rpi_dac_device = {
.name = "snd-rpi-dac",
.id = 0,
.num_resources = 0,
};
static struct platform_device snd_pcm1794a_codec_device = {
.name = "pcm1794a-codec",
.id = -1,
.num_resources = 0,
};
#endif
int __init bcm_register_device(struct platform_device *pdev)
{
int ret;
@@ -825,6 +839,11 @@ void __init bcm2708_init(void)
bcm_register_device_dt(&snd_pcm5102a_codec_device);
#endif
#if defined(CONFIG_SND_BCM2708_SOC_RPI_DAC) || defined(CONFIG_SND_BCM2708_SOC_RPI_DAC_MODULE)
bcm_register_device_dt(&snd_rpi_dac_device);
bcm_register_device_dt(&snd_pcm1794a_codec_device);
#endif
if (!use_dt) {
for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
struct amba_device *d = amba_devs[i];

7
sound/soc/bcm/Kconfig
View File

@@ -25,3 +25,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.

2
sound/soc/bcm/Makefile
View File

@@ -10,5 +10,7 @@ obj-$(CONFIG_SND_BCM2708_SOC_I2S) += snd-soc-bcm2708-i2s.o
# 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

97
sound/soc/bcm/rpi-dac.c Normal file
View File

@@ -0,0 +1,97 @@
/*
* 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;
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 struct platform_driver snd_rpi_rpi_dac_driver = {
.driver = {
.name = "snd-rpi-dac",
.owner = THIS_MODULE,
},
.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");

4
sound/soc/codecs/Kconfig
View File

@@ -84,6 +84,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_PCM512x_SPI if SPI_MASTER
select SND_SOC_RT286 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
@@ -512,6 +513,9 @@ config SND_SOC_RT286
tristate
depends on I2C
config SND_SOC_PCM1794A
tristate
config SND_SOC_PCM5102A
tristate

2
sound/soc/codecs/Makefile
View File

@@ -78,6 +78,7 @@ snd-soc-pcm512x-i2c-objs := pcm512x-i2c.o
snd-soc-pcm512x-spi-objs := pcm512x-spi.o
snd-soc-rl6231-objs := rl6231.o
snd-soc-rt286-objs := rt286.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
@@ -264,6 +265,7 @@ obj-$(CONFIG_SND_SOC_PCM512x_I2C) += snd-soc-pcm512x-i2c.o
obj-$(CONFIG_SND_SOC_PCM512x_SPI) += snd-soc-pcm512x-spi.o
obj-$(CONFIG_SND_SOC_RL6231) += snd-soc-rl6231.o
obj-$(CONFIG_SND_SOC_RT286) += snd-soc-rt286.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

62
sound/soc/codecs/pcm1794a.c Normal file
View File

@@ -0,0 +1,62 @@
/*
* 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 struct platform_driver pcm1794a_codec_driver = {
.probe = pcm1794a_probe,
.remove = pcm1794a_remove,
.driver = {
.name = "pcm1794a-codec",
.owner = THIS_MODULE,
},
};
module_platform_driver(pcm1794a_codec_driver);
MODULE_DESCRIPTION("ASoC PCM1794A codec driver");
MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
MODULE_LICENSE("GPL v2");