Skip to content

Commit a7fddf4

Browse files
josh-blakejosh-blake
authored
Merge branch 'raspberrypi:rpi-6.18.y' into rpi-6.18.y
2 parents 3b4342f + d477259 commit a7fddf4

20 files changed

Lines changed: 1587 additions & 694 deletions

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
105105
hifiberry-dacplushd.dtbo \
106106
hifiberry-digi.dtbo \
107107
hifiberry-digi-pro.dtbo \
108+
hifiberry-studio-dac8x.dtbo \
109+
hifiberry-studio-dac8x-pro.dtbo \
108110
highperi.dtbo \
109111
hy28a.dtbo \
110112
hy28b.dtbo \

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2062,6 +2062,18 @@ Load: dtoverlay=hifiberry-digi-pro
20622062
Params: <None>
20632063

20642064

2065+
Name: hifiberry-studio-dac8x
2066+
Info: Configures the HifiBerry Studio DAC8x audio card
2067+
Load: dtoverlay=hifiberry-studio-dac8x
2068+
Params: <None>
2069+
2070+
2071+
Name: hifiberry-studio-dac8x-pro
2072+
Info: Configures the HifiBerry Studio DAC8x PRO audio card
2073+
Load: dtoverlay=hifiberry-studio-dac8x-pro
2074+
Params: <None>
2075+
2076+
20652077
Name: highperi
20662078
Info: Enables "High Peripheral" mode
20672079
Load: dtoverlay=highperi

‎arch/arm/boot/dts/overlays/hifiberry-studio-dac8x-overlay.dts‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
// Definitions for HiFiBerry Studio DAC8x soundcard
3+
/dts-v1/;
4+
/plugin/;
5+
6+
/ {
7+
compatible = "brcm,bcm2712";
8+
9+
fragment@0 {
10+
target = <&i2c1>;
11+
__overlay__ {
12+
status = "okay";
13+
};
14+
};
15+
16+
fragment@1 {
17+
target = <&gpio>;
18+
__overlay__ {
19+
rp1_i2s0_dac8x: rp1_i2s0_dac8x {
20+
function = "i2s0";
21+
pins = "gpio18", "gpio19", "gpio20",
22+
"gpio21", "gpio22", "gpio23",
23+
"gpio24", "gpio25", "gpio26",
24+
"gpio27";
25+
bias-disable;
26+
};
27+
};
28+
};
29+
30+
fragment@2 {
31+
target = <&i2s_clk_producer>;
32+
__overlay__ {
33+
pinctrl-names = "default";
34+
pinctrl-0 = <&rp1_i2s0_dac8x>;
35+
status = "okay";
36+
};
37+
};
38+
39+
fragment@3 {
40+
target-path = "/";
41+
__overlay__ {
42+
dummy-codec {
43+
#sound-dai-cells = <0>;
44+
compatible = "snd-soc-dummy";
45+
status = "okay";
46+
};
47+
};
48+
};
49+
50+
fragment@4 {
51+
target = <&sound>;
52+
__overlay__ {
53+
compatible = "hifiberry,hifiberry-studio-dac8x";
54+
i2s-controller = <&i2s_clk_producer>;
55+
status = "okay";
56+
};
57+
};
58+
59+
};

‎arch/arm/boot/dts/overlays/hifiberry-studio-dac8x-pro-overlay.dts‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
// Definitions for HiFiBerry Studio DAC8x PRO soundcard
3+
/dts-v1/;
4+
/plugin/;
5+
6+
/ {
7+
compatible = "brcm,bcm2712";
8+
9+
fragment@0 {
10+
target = <&i2c1>;
11+
__overlay__ {
12+
status = "okay";
13+
};
14+
};
15+
16+
fragment@1 {
17+
target = <&gpio>;
18+
__overlay__ {
19+
rp1_i2s1_dac8x: rp1_i2s1_dac8x {
20+
function = "i2s1";
21+
pins = "gpio18", "gpio19", "gpio20",
22+
"gpio21", "gpio22", "gpio23",
23+
"gpio24", "gpio25", "gpio26",
24+
"gpio27";
25+
bias-disable;
26+
};
27+
};
28+
};
29+
30+
fragment@2 {
31+
target = <&i2s_clk_consumer>;
32+
__overlay__ {
33+
pinctrl-names = "default";
34+
pinctrl-0 = <&rp1_i2s1_dac8x>;
35+
status = "okay";
36+
};
37+
};
38+
39+
fragment@3 {
40+
target-path = "/";
41+
__overlay__ {
42+
dummy-codec {
43+
#sound-dai-cells = <0>;
44+
compatible = "snd-soc-dummy";
45+
status = "okay";
46+
};
47+
};
48+
};
49+
50+
fragment@4 {
51+
target = <&sound>;
52+
__overlay__ {
53+
compatible = "hifiberry,hifiberry-studio-dac8x";
54+
i2s-controller = <&i2s_clk_consumer>;
55+
clk-provider;
56+
status = "okay";
57+
};
58+
};
59+
60+
};

‎arch/arm/configs/bcm2709_defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1599,6 +1599,7 @@ CONFIG_CRYPTO_SHA1=m
15991599
CONFIG_CRYPTO_WP512=m
16001600
CONFIG_CRYPTO_XCBC=m
16011601
CONFIG_CRYPTO_LZ4=m
1602+
CONFIG_CRYPTO_LZ4HC=m
16021603
CONFIG_CRYPTO_USER_API_HASH=m
16031604
CONFIG_CRYPTO_USER_API_SKCIPHER=m
16041605
CONFIG_CRYPTO_USER_API_RNG=m

‎arch/arm/configs/bcmrpi_defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1593,6 +1593,7 @@ CONFIG_CRYPTO_SHA1=m
15931593
CONFIG_CRYPTO_WP512=m
15941594
CONFIG_CRYPTO_XCBC=m
15951595
CONFIG_CRYPTO_LZ4=m
1596+
CONFIG_CRYPTO_LZ4HC=m
15961597
CONFIG_CRYPTO_USER_API_HASH=m
15971598
CONFIG_CRYPTO_USER_API_SKCIPHER=m
15981599
CONFIG_CRYPTO_USER_API_RNG=m

‎arch/arm64/configs/bcm2711_defconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,6 +1148,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSHD=m
11481148
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m
11491149
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m
11501150
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m
1151+
CONFIG_SND_BCM2708_SOC_HIFIBERRY_STUDIO_DAC8X=m
11511152
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
11521153
CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
11531154
CONFIG_SND_BCM2708_SOC_PIFI_40=m
@@ -1724,6 +1725,7 @@ CONFIG_CRYPTO_SHA1=m
17241725
CONFIG_CRYPTO_WP512=m
17251726
CONFIG_CRYPTO_XCBC=m
17261727
CONFIG_CRYPTO_LZ4=m
1728+
CONFIG_CRYPTO_LZ4HC=m
17271729
CONFIG_CRYPTO_USER_API_HASH=m
17281730
CONFIG_CRYPTO_USER_API_SKCIPHER=m
17291731
CONFIG_CRYPTO_USER_API_RNG=m

‎arch/arm64/configs/bcm2711_rt_defconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,6 +1147,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSHD=m
11471147
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m
11481148
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m
11491149
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m
1150+
CONFIG_SND_BCM2708_SOC_HIFIBERRY_STUDIO_DAC8X=m
11501151
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
11511152
CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
11521153
CONFIG_SND_BCM2708_SOC_PIFI_40=m
@@ -1722,6 +1723,7 @@ CONFIG_CRYPTO_SHA1=m
17221723
CONFIG_CRYPTO_WP512=m
17231724
CONFIG_CRYPTO_XCBC=m
17241725
CONFIG_CRYPTO_LZ4=m
1726+
CONFIG_CRYPTO_LZ4HC=m
17251727
CONFIG_CRYPTO_USER_API_HASH=m
17261728
CONFIG_CRYPTO_USER_API_SKCIPHER=m
17271729
CONFIG_CRYPTO_USER_API_RNG=m

‎arch/arm64/configs/bcm2712_defconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,6 +1150,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSHD=m
11501150
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m
11511151
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m
11521152
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m
1153+
CONFIG_SND_BCM2708_SOC_HIFIBERRY_STUDIO_DAC8X=m
11531154
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
11541155
CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
11551156
CONFIG_SND_BCM2708_SOC_PIFI_40=m
@@ -1726,6 +1727,7 @@ CONFIG_CRYPTO_SHA1=m
17261727
CONFIG_CRYPTO_WP512=m
17271728
CONFIG_CRYPTO_XCBC=m
17281729
CONFIG_CRYPTO_LZ4=m
1730+
CONFIG_CRYPTO_LZ4HC=m
17291731
CONFIG_CRYPTO_USER_API_HASH=m
17301732
CONFIG_CRYPTO_USER_API_SKCIPHER=m
17311733
CONFIG_CRYPTO_USER_API_RNG=m

0 commit comments

Comments
 (0)