Skip to content

Commit bf84bab

Browse files
committed
Revert "Added driver for HiFiBerry Amp amplifier add-on board"
This reverts commit 3e6b00833d92a50cbcc9922deb6e1bc8fcdbb587.
1 parent 5300d0c commit bf84bab

File tree

7 files changed

+0
-723
lines changed

7 files changed

+0
-723
lines changed

sound/soc/bcm/Kconfig

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,6 @@ config SND_BCM2708_SOC_HIFIBERRY_DIGI
3838
help
3939
Say Y or M if you want to add support for HifiBerry Digi S/PDIF output board.
4040

41-
config SND_BCM2708_SOC_HIFIBERRY_AMP
42-
tristate "Support for the HifiBerry Amp"
43-
depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
44-
select SND_SOC_TAS5713
45-
help
46-
Say Y or M if you want to add support for the HifiBerry Amp amplifier board.
47-
4841
config SND_BCM2708_SOC_RPI_DAC
4942
tristate "Support for RPi-DAC"
5043
depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S

sound/soc/bcm/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,11 @@ obj-$(CONFIG_SND_SOC_CYGNUS) += snd-soc-cygnus.o
1212
snd-soc-hifiberry-dac-objs := hifiberry_dac.o
1313
snd-soc-hifiberry-dacplus-objs := hifiberry_dacplus.o
1414
snd-soc-hifiberry-digi-objs := hifiberry_digi.o
15-
snd-soc-hifiberry-amp-objs := hifiberry_amp.o
1615
snd-soc-rpi-dac-objs := rpi-dac.o
1716
snd-soc-iqaudio-dac-objs := iqaudio-dac.o
1817

1918
obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC) += snd-soc-hifiberry-dac.o
2019
obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS) += snd-soc-hifiberry-dacplus.o
2120
obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI) += snd-soc-hifiberry-digi.o
22-
obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP) += snd-soc-hifiberry-amp.o
2321
obj-$(CONFIG_SND_BCM2708_SOC_RPI_DAC) += snd-soc-rpi-dac.o
2422
obj-$(CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC) += snd-soc-iqaudio-dac.o

sound/soc/bcm/hifiberry_amp.c

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

sound/soc/codecs/Kconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ config SND_SOC_ALL_CODECS
139139
select SND_SOC_TFA9879 if I2C
140140
select SND_SOC_TLV320AIC23_I2C if I2C
141141
select SND_SOC_TLV320AIC23_SPI if SPI_MASTER
142-
select SND_SOC_TAS5713 if I2C
143142
select SND_SOC_TLV320AIC26 if SPI_MASTER
144143
select SND_SOC_TLV320AIC31XX if I2C
145144
select SND_SOC_TLV320AIC32X4_I2C if I2C
@@ -822,9 +821,6 @@ config SND_SOC_TFA9879
822821
tristate "NXP Semiconductors TFA9879 amplifier"
823822
depends on I2C
824823

825-
config SND_SOC_TAS5713
826-
tristate
827-
828824
config SND_SOC_TLV320AIC23
829825
tristate
830826

sound/soc/codecs/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ snd-soc-tas5086-objs := tas5086.o
144144
snd-soc-tas571x-objs := tas571x.o
145145
snd-soc-tas5720-objs := tas5720.o
146146
snd-soc-tfa9879-objs := tfa9879.o
147-
snd-soc-tas5713-objs := tas5713.o
148147
snd-soc-tlv320aic23-objs := tlv320aic23.o
149148
snd-soc-tlv320aic23-i2c-objs := tlv320aic23-i2c.o
150149
snd-soc-tlv320aic23-spi-objs := tlv320aic23-spi.o
@@ -367,7 +366,6 @@ obj-$(CONFIG_SND_SOC_TAS5086) += snd-soc-tas5086.o
367366
obj-$(CONFIG_SND_SOC_TAS571X) += snd-soc-tas571x.o
368367
obj-$(CONFIG_SND_SOC_TAS5720) += snd-soc-tas5720.o
369368
obj-$(CONFIG_SND_SOC_TFA9879) += snd-soc-tfa9879.o
370-
obj-$(CONFIG_SND_SOC_TAS5713) += snd-soc-tas5713.o
371369
obj-$(CONFIG_SND_SOC_TLV320AIC23) += snd-soc-tlv320aic23.o
372370
obj-$(CONFIG_SND_SOC_TLV320AIC23_I2C) += snd-soc-tlv320aic23-i2c.o
373371
obj-$(CONFIG_SND_SOC_TLV320AIC23_SPI) += snd-soc-tlv320aic23-spi.o

0 commit comments

Comments
 (0)