Skip to content

ASoC: hifiberry_studio: change driver name and add support for new soundcards #7487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pelwell merged 4 commits into from
Jul 14, 2026
Merged

ASoC: hifiberry_studio: change driver name and add support for new soundcards #7487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff28ec6
ASoC: rename hifiberry_studio_dac8x.c to hifiberry_studio.c
j-schambacher Jul 13, 2026
05611c4
ASoC: hifiberry_studio: add multi-card and Digi/AES support
j-schambacher Jul 13, 2026
68380bf
overlays: hifiberry-studio: add Digi/AES overlay, register controller
j-schambacher Jul 13, 2026
57efdb6
arm64: configs: fix stale HIFIBERRY_STUDIO_DAC8X symbol name
j-schambacher Jul 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions arch/arm/boot/dts/overlays/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
hifiberry-digi-pro.dtbo \
hifiberry-studio-dac8x.dtbo \
hifiberry-studio-dac8x-pro.dtbo \
hifiberry-studio-digi.dtbo \
highperi.dtbo \
hy28a.dtbo \
hy28b.dtbo \
Expand Down
17 changes: 13 additions & 4 deletions arch/arm/boot/dts/overlays/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2127,14 +2127,23 @@ Params: <None>

Name: hifiberry-studio-dac8x
Info: Configures the HifiBerry Studio DAC8x audio card
Load: dtoverlay=hifiberry-studio-dac8x
Params: <None>
Load: dtoverlay=hifiberry-studio-dac8x,<param>=<val>
Params: no_controls Do not register the ALSA controls for
this card


Name: hifiberry-studio-dac8x-pro
Info: Configures the HifiBerry Studio DAC8x PRO audio card
Load: dtoverlay=hifiberry-studio-dac8x-pro
Params: <None>
Load: dtoverlay=hifiberry-studio-dac8x-pro,<param>=<val>
Params: no_controls Do not register the ALSA controls for
this card


Name: hifiberry-studio-digi
Info: Configures the HifiBerry Studio Digi/AES audio card
Load: dtoverlay=hifiberry-studio-digi,<param>=<val>
Params: no_controls Do not register the ALSA controls for
this card


Name: highperi
Expand Down
12 changes: 11 additions & 1 deletion arch/arm/boot/dts/overlays/hifiberry-studio-dac8x-overlay.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
target = <&i2c1>;
__overlay__ {
status = "okay";
#address-cells = <1>;
#size-cells = <0>;
hb_studio_ctrl: hb_studio_ctrl@10 {
compatible = "hifiberry,hb-studio-ctrl";
reg = <0x10>;
status = "okay";
};
};
};

Expand Down Expand Up @@ -49,11 +56,14 @@

fragment@4 {
target = <&sound>;
__overlay__ {
hifiberry_studio: __overlay__ {
compatible = "hifiberry,hifiberry-studio-dac8x";
i2s-controller = <&i2s_clk_producer>;
status = "okay";
};
};

__overrides__ {
no_controls = <&hifiberry_studio>,"no-controls?";
};
};
14 changes: 12 additions & 2 deletions arch/arm/boot/dts/overlays/hifiberry-studio-dac8x-pro-overlay.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
target = <&i2c1>;
__overlay__ {
status = "okay";
#address-cells = <1>;
#size-cells = <0>;
hb_studio_ctrl: hb_studio_ctrl@10 {
compatible = "hifiberry,hb-studio-ctrl";
reg = <0x10>;
status = "okay";
};
};
};

Expand Down Expand Up @@ -49,12 +56,15 @@

fragment@4 {
target = <&sound>;
__overlay__ {
compatible = "hifiberry,hifiberry-studio-dac8x";
hifiberry_studio: __overlay__ {
compatible = "hifiberry,hifiberry-studio";
i2s-controller = <&i2s_clk_consumer>;
clk-provider;
status = "okay";
};
};

__overrides__ {
no_controls = <&hifiberry_studio>,"no-controls?";
};
};
83 changes: 83 additions & 0 deletions arch/arm/boot/dts/overlays/hifiberry-studio-digi-overlay.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
// SPDX-License-Identifier: GPL-2.0
// Definitions for HiFiBerry Studio Digi/AES soundcard
/dts-v1/;
/plugin/;

#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/bcm2835.h>

/ {
compatible = "brcm,bcm2712";

fragment@0 {
target = <&i2c1>;
__overlay__ {
status = "okay";
#address-cells = <1>;
#size-cells = <0>;
hb_studio_ctrl: hb_studio_ctrl@10 {
compatible = "hifiberry,hb-studio-ctrl";
reg = <0x10>;
status = "okay";
};
};
};

fragment@1 {
target = <&gpio>;
__overlay__ {
rp1_i2s1_digi: rp1_i2s1_digi {
function = "i2s1";
pins = "gpio18", "gpio19", "gpio20",
"gpio21", "gpio22", "gpio23",
"gpio24", "gpio25", "gpio26",
"gpio27";
bias-disable;
};
digi_int_pin: digi_int_pin {
pins = "gpio7";
bias-pull-up;
};
};
};

fragment@2 {
target = <&i2s_clk_consumer>;
__overlay__ {
pinctrl-names = "default";
pinctrl-0 = <&rp1_i2s1_digi>;
status = "okay";
};
};

fragment@3 {
target-path = "/";
__overlay__ {
dummy-codec {
#sound-dai-cells = <0>;
compatible = "snd-soc-dummy";
status = "okay";
};
};
};

fragment@4 {
target = <&sound>;
hifiberry_studio: __overlay__ {
compatible = "hifiberry,hifiberry-studio";
i2s-controller = <&i2s_clk_consumer>;
clk-provider;
pinctrl-names = "default";
pinctrl-0 = <&digi_int_pin>;
interrupt-parent = <&gpio>;
interrupts = <7 IRQ_TYPE_EDGE_BOTH>;
gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
status = "okay";
};
};

__overrides__ {
no_controls = <&hifiberry_studio>,"no-controls?";
};
};
2 changes: 1 addition & 1 deletion arch/arm64/configs/bcm2711_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1160,7 +1160,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSHD=m
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m
CONFIG_SND_BCM2708_SOC_HIFIBERRY_STUDIO_DAC8X=m
CONFIG_SND_BCM2708_SOC_HIFIBERRY_STUDIO=m
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
CONFIG_SND_BCM2708_SOC_PIFI_40=m
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/configs/bcm2711_rt_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1156,7 +1156,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSHD=m
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m
CONFIG_SND_BCM2708_SOC_HIFIBERRY_STUDIO_DAC8X=m
CONFIG_SND_BCM2708_SOC_HIFIBERRY_STUDIO=m
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
CONFIG_SND_BCM2708_SOC_PIFI_40=m
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/configs/bcm2712_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1162,7 +1162,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSHD=m
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m
CONFIG_SND_BCM2708_SOC_HIFIBERRY_STUDIO_DAC8X=m
CONFIG_SND_BCM2708_SOC_HIFIBERRY_STUDIO=m
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
CONFIG_SND_BCM2708_SOC_PIFI_40=m
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/bcm/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ config SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP
help
Say Y or M if you want to add support for HifiBerry DSP-DAC.

config SND_BCM2708_SOC_HIFIBERRY_STUDIO_DAC8X
config SND_BCM2708_SOC_HIFIBERRY_STUDIO
tristate "Support for HifiBerry Studio DAC8x soundcards"
help
Say Y or M if you want to add support for
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/bcm/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ snd-soc-hifiberry-dacplushd-objs := hifiberry_dacplushd.o
snd-soc-hifiberry-dacplusadc-objs := hifiberry_dacplusadc.o
snd-soc-hifiberry-dacplusadcpro-objs := hifiberry_dacplusadcpro.o
snd-soc-hifiberry-dacplusdsp-objs := hifiberry_dacplusdsp.o
snd-soc-hifiberry-studio-dac8x-objs := hifiberry_studio_dac8x.o
snd-soc-hifiberry-studio-objs := hifiberry_studio.o
snd-soc-justboom-both-objs := justboom-both.o
snd-soc-justboom-dac-objs := justboom-dac.o
snd-soc-rpi-cirrus-objs := rpi-cirrus.o
Expand Down Expand Up @@ -59,7 +59,7 @@ obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSHD) += snd-soc-hifiberry-dacplushd
obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC) += snd-soc-hifiberry-dacplusadc.o
obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO) += snd-soc-hifiberry-dacplusadcpro.o
obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP) += snd-soc-hifiberry-dacplusdsp.o
obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_STUDIO_DAC8X) += snd-soc-hifiberry-studio-dac8x.o
obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_STUDIO) += snd-soc-hifiberry-studio.o
obj-$(CONFIG_SND_BCM2708_SOC_JUSTBOOM_BOTH) += snd-soc-justboom-both.o
obj-$(CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC) += snd-soc-justboom-dac.o
obj-$(CONFIG_SND_BCM2708_SOC_RPI_CIRRUS) += snd-soc-rpi-cirrus.o
Expand Down
Loading
Loading