Skip to content

Commit b2dd4b2

Browse files
allocompelwell
allocom
authored andcommitted
Driver for Allo Katana DAC
1 parent cd0aa36 commit b2dd4b2

File tree

10 files changed

+387
-558
lines changed

10 files changed

+387
-558
lines changed
Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
/*
22
* Definitions for Allo Katana DAC boards
3-
*
4-
* NB. The Katana DAC board contains SABER DAC.
53
*/
64

75
/dts-v1/;
@@ -13,7 +11,16 @@
1311
fragment@0 {
1412
target = <&i2s>;
1513
__overlay__ {
14+
#sound-dai-cells = <0>;
1615
status = "okay";
16+
cpu_port: port {
17+
cpu_endpoint: endpoint {
18+
remote-endpoint = <&codec_endpoint>;
19+
bitclock-master = <&codec_endpoint>;
20+
frame-master = <&codec_endpoint>;
21+
dai-format = "i2s";
22+
};
23+
};
1724
};
1825
};
1926

@@ -24,23 +31,27 @@
2431
#size-cells = <0>;
2532
status = "okay";
2633

27-
sabre-ess@30 {
34+
allo-katana-codec@30 {
2835
#sound-dai-cells = <0>;
29-
compatible = "saber,sabre-ess";
36+
compatible = "allo,allo-katana-codec";
3037
reg = <0x30>;
31-
status = "okay";
38+
port {
39+
codec_endpoint: endpoint {
40+
remote-endpoint = <&cpu_endpoint>;
41+
};
42+
};
3243
};
3344
};
3445
};
3546

3647
fragment@2 {
3748
target = <&sound>;
3849
katana_dac: __overlay__ {
39-
compatible = "allo,katana-dac";
40-
i2s-controller = <&i2s>;
50+
compatible = "audio-graph-card";
51+
label = "Allo Katana";
52+
dais = <&cpu_port>;
4153
status = "okay";
4254
};
4355
};
44-
4556
};
4657

sound/soc/bcm/Kconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,9 @@ config SND_BCM2708_SOC_ALLO_DIGIONE
178178
config SND_BCM2708_SOC_ALLO_KATANA_DAC
179179
tristate "Support for Allo Katana DAC"
180180
depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
181-
select SND_SOC_SABRE_ESS_I2C
181+
depends on I2C
182+
select REGMAP_I2C
183+
select SND_AUDIO_GRAPH_CARD
182184
help
183185
Say Y or M if you want to add support for Allo Katana DAC.
184186

sound/soc/bcm/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ snd-soc-allo-boss-dac-objs := allo-boss-dac.o
3434
snd-soc-allo-piano-dac-objs := allo-piano-dac.o
3535
snd-soc-allo-piano-dac-plus-objs := allo-piano-dac-plus.o
3636
snd-soc-allo-digione-objs := allo-digione.o
37-
snd-soc-allo-katana-dac-objs := allo-katana-dac.o
37+
snd-soc-allo-katana-codec-objs := allo-katana-codec.o
3838
snd-soc-pisound-objs := pisound.o
3939
snd-soc-fe-pi-audio-objs := fe-pi-audio.o
4040

@@ -61,6 +61,6 @@ obj-$(CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC) += snd-soc-allo-boss-dac.o
6161
obj-$(CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC) += snd-soc-allo-piano-dac.o
6262
obj-$(CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS) += snd-soc-allo-piano-dac-plus.o
6363
obj-$(CONFIG_SND_BCM2708_SOC_ALLO_DIGIONE) += snd-soc-allo-digione.o
64-
obj-$(CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC) += snd-soc-allo-katana-dac.o
64+
obj-$(CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC) += snd-soc-allo-katana-codec.o
6565
obj-$(CONFIG_SND_PISOUND) += snd-soc-pisound.o
6666
obj-$(CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO) += snd-soc-fe-pi-audio.o

0 commit comments

Comments
 (0)