Skip to content

Commit 286abfb

Browse files
Tim Goverpelwell
Tim Gover
authored andcommitted
ASoC: RPi composite driver for PCM512x based cards
Create a new composite driver to support PCM512x based Pi-HAT DAC soundcards in order to reduce the maintenance overhead for upstream changes. This replaces the specific drivers for the following cards: * Allo Piano DAC * DionAudio Loco V2 * Justboom DAC * IQAudioIO DAC
1 parent 8324b0c commit 286abfb

File tree

7 files changed

+384
-609
lines changed

7 files changed

+384
-609
lines changed

sound/soc/bcm/Kconfig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ config SND_BCM2708_SOC_JUSTBOOM_DAC
9191
tristate "Support for JustBoom DAC"
9292
depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
9393
select SND_SOC_PCM512x
94+
select SND_RPI_PCM512x_SOUNDCARD
9495
help
9596
Say Y or M if you want to add support for JustBoom DAC.
9697

@@ -106,6 +107,7 @@ config SND_BCM2708_SOC_IQAUDIO_DAC
106107
tristate "Support for IQaudIO-DAC"
107108
depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
108109
select SND_SOC_PCM512x_I2C
110+
select SND_RPI_PCM512x_SOUNDCARD
109111
help
110112
Say Y or M if you want to add support for IQaudIO-DAC.
111113

@@ -158,13 +160,15 @@ config SND_BCM2708_SOC_DIONAUDIO_LOCO_V2
158160
tristate "Support for Dion Audio LOCO-V2 DAC-AMP"
159161
depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
160162
select SND_SOC_PCM5122
163+
select SND_RPI_PCM512x_SOUNDCARD
161164
help
162165
Say Y or M if you want to add support for Dion Audio LOCO-V2.
163166

164167
config SND_BCM2708_SOC_ALLO_PIANO_DAC
165168
tristate "Support for Allo Piano DAC"
166169
depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
167170
select SND_SOC_PCM512x_I2C
171+
select SND_RPI_PCM512x_SOUNDCARD
168172
help
169173
Say Y or M if you want to add support for Allo Piano DAC.
170174

@@ -223,3 +227,9 @@ config SND_RPI_WM8804_SOUNDCARD
223227
help
224228
Say Y or M if you want to add support for the Raspberry Pi
225229
generic driver for WM8804 based soundcards.
230+
231+
config SND_RPI_PCM512x_SOUNDCARD
232+
tristate "Support for Raspberry Pi generic PCM512x soundcards"
233+
help
234+
Say Y or M if you want to add support for the Raspberry Pi
235+
generic driver for PCM512x based soundcards.

sound/soc/bcm/Makefile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,41 +14,35 @@ snd-soc-googlevoicehat-codec-objs := googlevoicehat-codec.o
1414
# BCM2708 Machine Support
1515
snd-soc-hifiberry-dacplus-objs := hifiberry_dacplus.o
1616
snd-soc-hifiberry-dacplusadc-objs := hifiberry_dacplusadc.o
17-
snd-soc-justboom-dac-objs := justboom-dac.o
1817
snd-soc-rpi-cirrus-objs := rpi-cirrus.o
1918
snd-soc-rpi-proto-objs := rpi-proto.o
20-
snd-soc-iqaudio-dac-objs := iqaudio-dac.o
2119
snd-soc-audioinjector-pi-soundcard-objs := audioinjector-pi-soundcard.o
2220
snd-soc-audioinjector-octo-soundcard-objs := audioinjector-octo-soundcard.o
2321
snd-soc-digidac1-soundcard-objs := digidac1-soundcard.o
2422
snd-soc-dionaudio-loco-objs := dionaudio_loco.o
25-
snd-soc-dionaudio-loco-v2-objs := dionaudio_loco-v2.o
2623
snd-soc-allo-boss-dac-objs := allo-boss-dac.o
27-
snd-soc-allo-piano-dac-objs := allo-piano-dac.o
2824
snd-soc-allo-piano-dac-plus-objs := allo-piano-dac-plus.o
2925
snd-soc-allo-katana-codec-objs := allo-katana-codec.o
3026
snd-soc-pisound-objs := pisound.o
3127
snd-soc-fe-pi-audio-objs := fe-pi-audio.o
3228
snd-soc-rpi-simple-soundcard-objs := rpi-simple-soundcard.o
3329
snd-soc-rpi-wm8804-soundcard-objs := rpi-wm8804-soundcard.o
30+
snd-soc-rpi-pcm512x-soundcard-objs := rpi-pcm512x-soundcard.o
3431

3532
obj-$(CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD) += snd-soc-googlevoicehat-codec.o
3633
obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS) += snd-soc-hifiberry-dacplus.o
3734
obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC) += snd-soc-hifiberry-dacplusadc.o
38-
obj-$(CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC) += snd-soc-justboom-dac.o
3935
obj-$(CONFIG_SND_BCM2708_SOC_RPI_CIRRUS) += snd-soc-rpi-cirrus.o
4036
obj-$(CONFIG_SND_BCM2708_SOC_RPI_PROTO) += snd-soc-rpi-proto.o
41-
obj-$(CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC) += snd-soc-iqaudio-dac.o
4237
obj-$(CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD) += snd-soc-audioinjector-pi-soundcard.o
4338
obj-$(CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD) += snd-soc-audioinjector-octo-soundcard.o
4439
obj-$(CONFIG_SND_DIGIDAC1_SOUNDCARD) += snd-soc-digidac1-soundcard.o
4540
obj-$(CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO) += snd-soc-dionaudio-loco.o
46-
obj-$(CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2) += snd-soc-dionaudio-loco-v2.o
4741
obj-$(CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC) += snd-soc-allo-boss-dac.o
48-
obj-$(CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC) += snd-soc-allo-piano-dac.o
4942
obj-$(CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS) += snd-soc-allo-piano-dac-plus.o
5043
obj-$(CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC) += snd-soc-allo-katana-codec.o
5144
obj-$(CONFIG_SND_PISOUND) += snd-soc-pisound.o
5245
obj-$(CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO) += snd-soc-fe-pi-audio.o
5346
obj-$(CONFIG_SND_RPI_SIMPLE_SOUNDCARD) += snd-soc-rpi-simple-soundcard.o
5447
obj-$(CONFIG_SND_RPI_WM8804_SOUNDCARD) += snd-soc-rpi-wm8804-soundcard.o
48+
obj-$(CONFIG_SND_RPI_PCM512x_SOUNDCARD) += snd-soc-rpi-pcm512x-soundcard.o

sound/soc/bcm/allo-piano-dac.c

Lines changed: 0 additions & 120 deletions
This file was deleted.

sound/soc/bcm/dionaudio_loco-v2.c

Lines changed: 0 additions & 115 deletions
This file was deleted.

0 commit comments

Comments
 (0)