Skip to content

Commit c79f5b4

Browse files
j-schambacherPhil Elwell
j-schambacher
authored and
Phil Elwell
committed
Add Hifiberry DAC+DSP soundcard driver (#3224)
Adds the driver for the Hifiberry DAC+DSP. It supports capture and playback depending on the DSP firmware. Signed-off-by: Joerg Schambacher <[email protected]>
1 parent f9adc73 commit c79f5b4

10 files changed

+162
-0
lines changed

‎arch/arm/boot/dts/overlays/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
5454
hifiberry-dacplus.dtbo \
5555
hifiberry-dacplusadc.dtbo \
5656
hifiberry-dacplusadcpro.dtbo \
57+
hifiberry-dacplusdsp.dtbo \
5758
hifiberry-digi.dtbo \
5859
hifiberry-digi-pro.dtbo \
5960
hy28a.dtbo \

‎arch/arm/boot/dts/overlays/README

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -904,6 +904,12 @@ Params: 24db_digital_gain Allow gain to be applied via the PCM512x codec
904904
master for bit clock and frame clock.
905905

906906

907+
Name: hifiberry-dacplusdsp
908+
Info: Configures the HifiBerry DAC+DSP audio card
909+
Load: dtoverlay=hifiberry-dacplusdsp
910+
Params: <None>
911+
912+
907913
Name: hifiberry-digi
908914
Info: Configures the HifiBerry Digi and Digi+ audio card
909915
Load: dtoverlay=hifiberry-digi

‎arch/arm/boot/dts/overlays/hifiberry-dacplusdsp-overlay.dts

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
// Definitions for hifiberry DAC+DSP soundcard overlay
2+
/dts-v1/;
3+
/plugin/;
4+
5+
/ {
6+
compatible = "brcm,bcm2835";
7+
8+
fragment@0 {
9+
target = <&i2s>;
10+
__overlay__ {
11+
status = "okay";
12+
};
13+
};
14+
15+
fragment@1 {
16+
target-path = "/";
17+
__overlay__ {
18+
dacplusdsp-codec {
19+
#sound-dai-cells = <0>;
20+
compatible = "hifiberry,dacplusdsp";
21+
status = "okay";
22+
};
23+
};
24+
};
25+
26+
fragment@2 {
27+
target = <&sound>;
28+
__overlay__ {
29+
compatible = "hifiberrydacplusdsp,hifiberrydacplusdsp-soundcard";
30+
i2s-controller = <&i2s>;
31+
status = "okay";
32+
};
33+
};
34+
};

‎arch/arm/configs/bcm2709_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -966,6 +966,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m
966966
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m
967967
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m
968968
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m
969+
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m
969970
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
970971
CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
971972
CONFIG_SND_BCM2708_SOC_RPI_CIRRUS=m

‎arch/arm/configs/bcm2711_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -931,6 +931,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m
931931
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m
932932
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m
933933
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m
934+
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m
934935
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
935936
CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
936937
CONFIG_SND_BCM2708_SOC_RPI_CIRRUS=m

‎arch/arm/configs/bcmrpi_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -958,6 +958,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m
958958
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m
959959
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m
960960
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m
961+
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m
961962
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
962963
CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
963964
CONFIG_SND_BCM2708_SOC_RPI_CIRRUS=m

‎sound/soc/bcm/Kconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,13 @@ config SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO
5656
help
5757
Say Y or M if you want to add support for HifiBerry DAC+ADC PRO.
5858

59+
config SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP
60+
tristate "Support for HifiBerry DAC+DSP"
61+
depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
62+
select SND_RPI_SIMPLE_SOUNDCARD
63+
help
64+
Say Y or M if you want to add support for HifiBerry DSP-DAC.
65+
5966
config SND_BCM2708_SOC_HIFIBERRY_DIGI
6067
tristate "Support for HifiBerry Digi"
6168
depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S

‎sound/soc/bcm/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ snd-soc-googlevoicehat-codec-objs := googlevoicehat-codec.o
1515
snd-soc-hifiberry-dacplus-objs := hifiberry_dacplus.o
1616
snd-soc-hifiberry-dacplusadc-objs := hifiberry_dacplusadc.o
1717
snd-soc-hifiberry-dacplusadcpro-objs := hifiberry_dacplusadcpro.o
18+
snd-soc-hifiberry-dacplusdsp-objs := hifiberry_dacplusdsp.o
1819
snd-soc-justboom-dac-objs := justboom-dac.o
1920
snd-soc-rpi-cirrus-objs := rpi-cirrus.o
2021
snd-soc-rpi-proto-objs := rpi-proto.o
@@ -40,6 +41,7 @@ obj-$(CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD) += snd-soc-googlevoiceha
4041
obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS) += snd-soc-hifiberry-dacplus.o
4142
obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC) += snd-soc-hifiberry-dacplusadc.o
4243
obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO) += snd-soc-hifiberry-dacplusadcpro.o
44+
obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP) += snd-soc-hifiberry-dacplusdsp.o
4345
obj-$(CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC) += snd-soc-justboom-dac.o
4446
obj-$(CONFIG_SND_BCM2708_SOC_RPI_CIRRUS) += snd-soc-rpi-cirrus.o
4547
obj-$(CONFIG_SND_BCM2708_SOC_RPI_PROTO) += snd-soc-rpi-proto.o

‎sound/soc/bcm/hifiberry_dacplusdsp.c

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
/*
3+
* ASoC Driver for HiFiBerry DAC + DSP
4+
*
5+
* Author: Joerg Schambacher <[email protected]>
6+
* Copyright 2018
7+
*
8+
* This program is free software; you can redistribute it and/or
9+
* modify it under the terms of the GNU General Public License
10+
* version 2 as published by the Free Software Foundation.
11+
*
12+
* This program is distributed in the hope that it will be useful, but
13+
* WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+
* General Public License for more details.
16+
*/
17+
18+
#include <linux/init.h>
19+
#include <linux/module.h>
20+
#include <linux/of.h>
21+
#include <linux/platform_device.h>
22+
#include <sound/soc.h>
23+
24+
static struct snd_soc_component_driver dacplusdsp_component_driver;
25+
26+
static struct snd_soc_dai_driver dacplusdsp_dai = {
27+
.name = "dacplusdsp-hifi",
28+
.capture = {
29+
.stream_name = "DAC+DSP Capture",
30+
.channels_min = 2,
31+
.channels_max = 2,
32+
.rates = SNDRV_PCM_RATE_CONTINUOUS,
33+
.formats = SNDRV_PCM_FMTBIT_S16_LE |
34+
SNDRV_PCM_FMTBIT_S24_LE |
35+
SNDRV_PCM_FMTBIT_S32_LE,
36+
},
37+
.playback = {
38+
.stream_name = "DACP+DSP Playback",
39+
.channels_min = 2,
40+
.channels_max = 2,
41+
.rates = SNDRV_PCM_RATE_CONTINUOUS,
42+
.formats = SNDRV_PCM_FMTBIT_S16_LE |
43+
SNDRV_PCM_FMTBIT_S24_LE |
44+
SNDRV_PCM_FMTBIT_S32_LE,
45+
},
46+
.symmetric_rates = 1};
47+
48+
#ifdef CONFIG_OF
49+
static const struct of_device_id dacplusdsp_ids[] = {
50+
{
51+
.compatible = "hifiberry,dacplusdsp",
52+
},
53+
{} };
54+
MODULE_DEVICE_TABLE(of, dacplusdsp_ids);
55+
#endif
56+
57+
static int dacplusdsp_platform_probe(struct platform_device *pdev)
58+
{
59+
int ret;
60+
61+
ret = snd_soc_register_component(&pdev->dev,
62+
&dacplusdsp_component_driver, &dacplusdsp_dai, 1);
63+
if (ret) {
64+
pr_alert("snd_soc_register_component failed\n");
65+
return ret;
66+
}
67+
68+
return 0;
69+
}
70+
71+
static int dacplusdsp_platform_remove(struct platform_device *pdev)
72+
{
73+
snd_soc_unregister_component(&pdev->dev);
74+
return 0;
75+
}
76+
77+
static struct platform_driver dacplusdsp_driver = {
78+
.driver = {
79+
.name = "hifiberry-dacplusdsp-codec",
80+
.of_match_table = of_match_ptr(dacplusdsp_ids),
81+
},
82+
.probe = dacplusdsp_platform_probe,
83+
.remove = dacplusdsp_platform_remove,
84+
};
85+
86+
module_platform_driver(dacplusdsp_driver);
87+
88+
MODULE_AUTHOR("Joerg Schambacher <[email protected]>");
89+
MODULE_DESCRIPTION("ASoC Driver for HiFiBerry DAC+DSP");
90+
MODULE_LICENSE("GPL v2");

‎sound/soc/bcm/rpi-simple-soundcard.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,23 @@ static struct snd_rpi_simple_drvdata drvdata_googlevoicehat = {
136136
.dai = snd_googlevoicehat_soundcard_dai,
137137
};
138138

139+
static struct snd_soc_dai_link snd_hifiberrydacplusdsp_soundcard_dai[] = {
140+
{
141+
.name = "Hifiberry DAC+DSP SoundCard",
142+
.stream_name = "Hifiberry DAC+DSP SoundCard HiFi",
143+
.codec_dai_name = "dacplusdsp-hifi",
144+
.codec_name = "dacplusdsp-codec",
145+
.dai_fmt = SND_SOC_DAIFMT_I2S |
146+
SND_SOC_DAIFMT_NB_NF |
147+
SND_SOC_DAIFMT_CBS_CFS,
148+
},
149+
};
150+
151+
static struct snd_rpi_simple_drvdata drvdata_hifiberrydacplusdsp = {
152+
.card_name = "snd_rpi_hifiberrydacplusdsp_soundcard",
153+
.dai = snd_hifiberrydacplusdsp_soundcard_dai,
154+
};
155+
139156
static struct snd_soc_dai_link snd_hifiberry_amp_dai[] = {
140157
{
141158
.name = "HifiBerry AMP",
@@ -193,6 +210,8 @@ static const struct of_device_id snd_rpi_simple_of_match[] = {
193210
.data = (void *) &drvdata_adau1977 },
194211
{ .compatible = "googlevoicehat,googlevoicehat-soundcard",
195212
.data = (void *) &drvdata_googlevoicehat },
213+
{ .compatible = "hifiberrydacplusdsp,hifiberrydacplusdsp-soundcard",
214+
.data = (void *) &drvdata_hifiberrydacplusdsp },
196215
{ .compatible = "hifiberry,hifiberry-amp",
197216
.data = (void *) &drvdata_hifiberry_amp },
198217
{ .compatible = "hifiberry,hifiberry-dac",

0 commit comments

Comments
 (0)