Skip to content

L
linux
Commit ce0c97f8 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Mark Brown
Browse files
Options

ASoC: Fix SND_SOC_ALL_CODECS imply SPI fallout 

Fixes for CONFIG_SPI=n:

    WARNING: unmet direct dependencies detected for REGMAP_SPI
      Depends on [n]: SPI [=n]
      Selected by [m]:
      - SND_SOC_ADAU1781_SPI [=m] && SOUND [=m] && !UML && SND [=m] && SND_SOC [=m]
      - SND_SOC_ADAU1977_SPI [=m] && SOUND [=m] && !UML && SND [=m] && SND_SOC [=m]

    ERROR: "spi_async" [...] undefined!
    ERROR: "spi_get_device_id" [...] undefined!
    ERROR: "__spi_register_driver" [...] undefined!
    ERROR: "spi_setup" [...] undefined!
    ERROR: "spi_sync" [...] undefined!
    ERROR: "spi_write_then_read" [...] undefined!
Reported-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Fixes: ea00d952 ("ASoC: Use imply for SND_SOC_ALL_CODECS")
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Link: https://lore.kernel.org/r/20200212145650.4602-2-geert@linux-m68k.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent eadd54c7
Show whitespace changes
Inline Side-by-side
Showing with 63 additions and 5 deletions
sound/soc/codecs/Kconfig
View file @ ce0c97f8
...@@ -327,12 +327,14 @@ config SND_SOC_AC97_CODEC ...@@ -327,12 +327,14 @@ config SND_SOC_AC97_CODEC
config SND_SOC_AD1836 config SND_SOC_AD1836
tristate tristate
depends on SPI_MASTER
config SND_SOC_AD193X config SND_SOC_AD193X
tristate tristate
config SND_SOC_AD193X_SPI config SND_SOC_AD193X_SPI
tristate tristate
depends on SPI_MASTER
select SND_SOC_AD193X select SND_SOC_AD193X
config SND_SOC_AD193X_I2C config SND_SOC_AD193X_I2C
...@@ -390,6 +392,7 @@ config SND_SOC_ADAU1781_I2C ...@@ -390,6 +392,7 @@ config SND_SOC_ADAU1781_I2C
config SND_SOC_ADAU1781_SPI config SND_SOC_ADAU1781_SPI
tristate tristate
depends on SPI_MASTER
select SND_SOC_ADAU1781 select SND_SOC_ADAU1781
select REGMAP_SPI select REGMAP_SPI
...@@ -398,6 +401,7 @@ config SND_SOC_ADAU1977 ...@@ -398,6 +401,7 @@ config SND_SOC_ADAU1977
config SND_SOC_ADAU1977_SPI config SND_SOC_ADAU1977_SPI
tristate tristate
depends on SPI_MASTER
select SND_SOC_ADAU1977 select SND_SOC_ADAU1977
select REGMAP_SPI select REGMAP_SPI
...@@ -441,6 +445,7 @@ config SND_SOC_ADAV80X ...@@ -441,6 +445,7 @@ config SND_SOC_ADAV80X
config SND_SOC_ADAV801 config SND_SOC_ADAV801
tristate tristate
depends on SPI_MASTER
select SND_SOC_ADAV80X select SND_SOC_ADAV80X
config SND_SOC_ADAV803 config SND_SOC_ADAV803
...@@ -498,6 +503,7 @@ config SND_SOC_ALC5623 ...@@ -498,6 +503,7 @@ config SND_SOC_ALC5623
config SND_SOC_ALC5632 config SND_SOC_ALC5632
tristate tristate
depends on I2C
config SND_SOC_BD28623 config SND_SOC_BD28623
tristate "ROHM BD28623 CODEC" tristate "ROHM BD28623 CODEC"
...@@ -698,6 +704,7 @@ config SND_SOC_L3 ...@@ -698,6 +704,7 @@ config SND_SOC_L3
config SND_SOC_DA7210 config SND_SOC_DA7210
tristate tristate
depends on I2C
config SND_SOC_DA7213 config SND_SOC_DA7213
tristate "Dialog DA7213 CODEC" tristate "Dialog DA7213 CODEC"
...@@ -705,15 +712,19 @@ config SND_SOC_DA7213 ...@@ -705,15 +712,19 @@ config SND_SOC_DA7213
config SND_SOC_DA7218 config SND_SOC_DA7218
tristate tristate
depends on I2C
config SND_SOC_DA7219 config SND_SOC_DA7219
tristate tristate
depends on I2C
config SND_SOC_DA732X config SND_SOC_DA732X
tristate tristate
depends on I2C
config SND_SOC_DA9055 config SND_SOC_DA9055
tristate tristate
depends on I2C
config SND_SOC_DMIC config SND_SOC_DMIC
tristate "Generic Digital Microphone CODEC" tristate "Generic Digital Microphone CODEC"
...@@ -773,9 +784,11 @@ config SND_SOC_INNO_RK3036 ...@@ -773,9 +784,11 @@ config SND_SOC_INNO_RK3036
config SND_SOC_ISABELLE config SND_SOC_ISABELLE
tristate tristate
depends on I2C
config SND_SOC_LM49453 config SND_SOC_LM49453
tristate tristate
depends on I2C
config SND_SOC_LOCHNAGAR_SC config SND_SOC_LOCHNAGAR_SC
tristate "Lochnagar Sound Card" tristate "Lochnagar Sound Card"
...@@ -803,9 +816,11 @@ config SND_SOC_MAX98088 ...@@ -803,9 +816,11 @@ config SND_SOC_MAX98088
config SND_SOC_MAX98090 config SND_SOC_MAX98090
tristate tristate
depends on I2C
config SND_SOC_MAX98095 config SND_SOC_MAX98095
tristate tristate
depends on I2C
config SND_SOC_MAX98357A config SND_SOC_MAX98357A
tristate "Maxim MAX98357A CODEC" tristate "Maxim MAX98357A CODEC"
...@@ -813,6 +828,7 @@ config SND_SOC_MAX98357A ...@@ -813,6 +828,7 @@ config SND_SOC_MAX98357A
config SND_SOC_MAX98371 config SND_SOC_MAX98371
tristate tristate
depends on I2C
config SND_SOC_MAX98504 config SND_SOC_MAX98504
tristate "Maxim MAX98504 speaker amplifier" tristate "Maxim MAX98504 speaker amplifier"
...@@ -824,9 +840,11 @@ config SND_SOC_MAX9867 ...@@ -824,9 +840,11 @@ config SND_SOC_MAX9867
config SND_SOC_MAX98925 config SND_SOC_MAX98925
tristate tristate
depends on I2C
config SND_SOC_MAX98926 config SND_SOC_MAX98926
tristate tristate
depends on I2C
config SND_SOC_MAX98927 config SND_SOC_MAX98927
tristate "Maxim Integrated MAX98927 Speaker Amplifier" tristate "Maxim Integrated MAX98927 Speaker Amplifier"
...@@ -838,6 +856,7 @@ config SND_SOC_MAX98373 ...@@ -838,6 +856,7 @@ config SND_SOC_MAX98373
config SND_SOC_MAX9850 config SND_SOC_MAX9850
tristate tristate
depends on I2C
config SND_SOC_MAX9860 config SND_SOC_MAX9860
tristate "Maxim MAX9860 Mono Audio Voice Codec" tristate "Maxim MAX9860 Mono Audio Voice Codec"
...@@ -1016,26 +1035,32 @@ config SND_SOC_RT298 ...@@ -1016,26 +1035,32 @@ config SND_SOC_RT298
config SND_SOC_RT1011 config SND_SOC_RT1011
tristate tristate
depends on I2C
config SND_SOC_RT1015 config SND_SOC_RT1015
tristate tristate
depends on I2C
config SND_SOC_RT1305 config SND_SOC_RT1305
tristate tristate
depends on I2C
config SND_SOC_RT1308 config SND_SOC_RT1308
tristate tristate
depends on I2C
config SND_SOC_RT1308_SDW config SND_SOC_RT1308_SDW
tristate "Realtek RT1308 Codec - SDW" tristate "Realtek RT1308 Codec - SDW"
depends on SOUNDWIRE depends on I2C && SOUNDWIRE
select REGMAP_SOUNDWIRE select REGMAP_SOUNDWIRE
config SND_SOC_RT5514 config SND_SOC_RT5514
tristate tristate
depends on I2C
config SND_SOC_RT5514_SPI config SND_SOC_RT5514_SPI
tristate tristate
depends on SPI_MASTER
config SND_SOC_RT5514_SPI_BUILTIN config SND_SOC_RT5514_SPI_BUILTIN
bool # force RT5514_SPI to be built-in to avoid link errors bool # force RT5514_SPI to be built-in to avoid link errors
...@@ -1051,30 +1076,39 @@ config SND_SOC_RT5631 ...@@ -1051,30 +1076,39 @@ config SND_SOC_RT5631
config SND_SOC_RT5640 config SND_SOC_RT5640
tristate tristate
depends on I2C
config SND_SOC_RT5645 config SND_SOC_RT5645
tristate tristate
depends on I2C
config SND_SOC_RT5651 config SND_SOC_RT5651
tristate tristate
depends on I2C
config SND_SOC_RT5659 config SND_SOC_RT5659
tristate tristate
depends on I2C
config SND_SOC_RT5660 config SND_SOC_RT5660
tristate tristate
depends on I2C
config SND_SOC_RT5663 config SND_SOC_RT5663
tristate tristate
depends on I2C
config SND_SOC_RT5665 config SND_SOC_RT5665
tristate tristate
depends on I2C
config SND_SOC_RT5668 config SND_SOC_RT5668
tristate tristate
depends on I2C
config SND_SOC_RT5670 config SND_SOC_RT5670
tristate tristate
depends on I2C
config SND_SOC_RT5677 config SND_SOC_RT5677
tristate tristate
...@@ -1087,6 +1121,7 @@ config SND_SOC_RT5677_SPI ...@@ -1087,6 +1121,7 @@ config SND_SOC_RT5677_SPI
config SND_SOC_RT5682 config SND_SOC_RT5682
tristate tristate
depends on I2C
config SND_SOC_RT700 config SND_SOC_RT700
tristate tristate
...@@ -1154,6 +1189,7 @@ config SND_SOC_SSM2305 ...@@ -1154,6 +1189,7 @@ config SND_SOC_SSM2305
config SND_SOC_SSM2518 config SND_SOC_SSM2518
tristate tristate
depends on I2C
config SND_SOC_SSM2602 config SND_SOC_SSM2602
tristate tristate
...@@ -1185,6 +1221,7 @@ config SND_SOC_STA350 ...@@ -1185,6 +1221,7 @@ config SND_SOC_STA350
config SND_SOC_STA529 config SND_SOC_STA529
tristate tristate
depends on I2C
config SND_SOC_STAC9766 config SND_SOC_STAC9766
tristate tristate
...@@ -1282,6 +1319,7 @@ config SND_SOC_TLV320AIC3X ...@@ -1282,6 +1319,7 @@ config SND_SOC_TLV320AIC3X
config SND_SOC_TLV320DAC33 config SND_SOC_TLV320DAC33
tristate tristate
depends on I2C
config SND_SOC_TS3A227E config SND_SOC_TS3A227E
tristate "TI Headset/Mic detect and keypress chip" tristate "TI Headset/Mic detect and keypress chip"
...@@ -1348,18 +1386,23 @@ config SND_SOC_WL1273 ...@@ -1348,18 +1386,23 @@ config SND_SOC_WL1273
config SND_SOC_WM0010 config SND_SOC_WM0010
tristate tristate
depends on SPI_MASTER
config SND_SOC_WM1250_EV1 config SND_SOC_WM1250_EV1
tristate tristate
depends on I2C
config SND_SOC_WM2000 config SND_SOC_WM2000
tristate tristate
depends on I2C
config SND_SOC_WM2200 config SND_SOC_WM2200
tristate tristate
depends on I2C
config SND_SOC_WM5100 config SND_SOC_WM5100
tristate tristate
depends on I2C
config SND_SOC_WM5102 config SND_SOC_WM5102
tristate tristate
...@@ -1462,9 +1505,11 @@ config SND_SOC_WM8904 ...@@ -1462,9 +1505,11 @@ config SND_SOC_WM8904
config SND_SOC_WM8940 config SND_SOC_WM8940
tristate tristate
depends on I2C
config SND_SOC_WM8955 config SND_SOC_WM8955
tristate tristate
depends on I2C
config SND_SOC_WM8960 config SND_SOC_WM8960
tristate "Wolfson Microelectronics WM8960 CODEC" tristate "Wolfson Microelectronics WM8960 CODEC"
...@@ -1472,6 +1517,7 @@ config SND_SOC_WM8960 ...@@ -1472,6 +1517,7 @@ config SND_SOC_WM8960
config SND_SOC_WM8961 config SND_SOC_WM8961
tristate tristate
depends on I2C
config SND_SOC_WM8962 config SND_SOC_WM8962
tristate "Wolfson Microelectronics WM8962 CODEC" tristate "Wolfson Microelectronics WM8962 CODEC"
...@@ -1479,6 +1525,7 @@ config SND_SOC_WM8962 ...@@ -1479,6 +1525,7 @@ config SND_SOC_WM8962
config SND_SOC_WM8971 config SND_SOC_WM8971
tristate tristate
depends on I2C
config SND_SOC_WM8974 config SND_SOC_WM8974
tristate "Wolfson Microelectronics WM8974 codec" tristate "Wolfson Microelectronics WM8974 codec"
...@@ -1490,6 +1537,7 @@ config SND_SOC_WM8978 ...@@ -1490,6 +1537,7 @@ config SND_SOC_WM8978
config SND_SOC_WM8983 config SND_SOC_WM8983
tristate tristate
depends on I2C
config SND_SOC_WM8985 config SND_SOC_WM8985
tristate "Wolfson Microelectronics WM8985 and WM8758 codec driver" tristate "Wolfson Microelectronics WM8985 and WM8758 codec driver"
...@@ -1500,12 +1548,15 @@ config SND_SOC_WM8988 ...@@ -1500,12 +1548,15 @@ config SND_SOC_WM8988
config SND_SOC_WM8990 config SND_SOC_WM8990
tristate tristate
depends on I2C
config SND_SOC_WM8991 config SND_SOC_WM8991
tristate tristate
depends on I2C
config SND_SOC_WM8993 config SND_SOC_WM8993
tristate tristate
depends on I2C
config SND_SOC_WM8994 config SND_SOC_WM8994
tristate tristate
...@@ -1515,6 +1566,7 @@ config SND_SOC_WM8995 ...@@ -1515,6 +1566,7 @@ config SND_SOC_WM8995
config SND_SOC_WM8996 config SND_SOC_WM8996
tristate tristate
depends on I2C
config SND_SOC_WM8997 config SND_SOC_WM8997
tristate tristate
...@@ -1528,6 +1580,7 @@ config SND_SOC_WM9081 ...@@ -1528,6 +1580,7 @@ config SND_SOC_WM9081
config SND_SOC_WM9090 config SND_SOC_WM9090
tristate tristate
depends on I2C
config SND_SOC_WM9705 config SND_SOC_WM9705
tristate tristate
...@@ -1561,6 +1614,7 @@ config SND_SOC_ZX_AUD96P22 ...@@ -1561,6 +1614,7 @@ config SND_SOC_ZX_AUD96P22
# Amp # Amp
config SND_SOC_LM4857 config SND_SOC_LM4857
tristate tristate
depends on I2C
config SND_SOC_MAX9759 config SND_SOC_MAX9759
tristate "Maxim MAX9759 speaker Amplifier" tristate "Maxim MAX9759 speaker Amplifier"
...@@ -1568,15 +1622,18 @@ config SND_SOC_MAX9759 ...@@ -1568,15 +1622,18 @@ config SND_SOC_MAX9759
config SND_SOC_MAX9768 config SND_SOC_MAX9768
tristate tristate
depends on I2C
config SND_SOC_MAX9877 config SND_SOC_MAX9877
tristate tristate
depends on I2C
config SND_SOC_MC13783 config SND_SOC_MC13783
tristate tristate
config SND_SOC_ML26124 config SND_SOC_ML26124
tristate tristate
depends on I2C
config SND_SOC_MT6351 config SND_SOC_MT6351
tristate "MediaTek MT6351 Codec" tristate "MediaTek MT6351 Codec"
...@@ -1614,6 +1671,7 @@ config SND_SOC_NAU8824 ...@@ -1614,6 +1671,7 @@ config SND_SOC_NAU8824
config SND_SOC_NAU8825 config SND_SOC_NAU8825
tristate tristate
depends on I2C
config SND_SOC_TPA6130A2 config SND_SOC_TPA6130A2
tristate "Texas Instruments TPA6130A2 headphone amplifier" tristate "Texas Instruments TPA6130A2 headphone amplifier"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7