Commit dc7f090d authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown

ASoC: samsung: Update dependencies for Arizona machine drivers

Currently it is possible to get the following bad config:

WARNING: unmet direct dependencies detected for SND_SOC_WM5110
  Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && MFD_WM5110 [=n]

commit ea00d952 ("ASoC: Use imply for SND_SOC_ALL_CODECS")
commit d8dd3f92 ("ASoC: Fix SND_SOC_ALL_CODECS imply misc fallout")

After these two patches the machine drivers still selects the
SND_SOC_WM5110 symbol which doesn't take account of the dependency
added on the MFD_WM5110 symbol, fix this by also adding a dependency on
MFD_WM5110 itself.
Reported-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20200220125654.7064-1-ckeepax@opensource.cirrus.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9d6ee365
...@@ -151,7 +151,7 @@ config SND_SOC_TOBERMORY ...@@ -151,7 +151,7 @@ config SND_SOC_TOBERMORY
config SND_SOC_BELLS config SND_SOC_BELLS
tristate "Audio support for Wolfson Bells" tristate "Audio support for Wolfson Bells"
depends on MFD_ARIZONA && I2C && SPI_MASTER depends on MFD_ARIZONA && MFD_WM5102 && MFD_WM5110 && I2C && SPI_MASTER
depends on MACH_WLF_CRAGG_6410 || COMPILE_TEST depends on MACH_WLF_CRAGG_6410 || COMPILE_TEST
select SND_SAMSUNG_I2S select SND_SAMSUNG_I2S
select SND_SOC_WM5102 select SND_SOC_WM5102
...@@ -204,7 +204,7 @@ config SND_SOC_ARNDALE ...@@ -204,7 +204,7 @@ config SND_SOC_ARNDALE
config SND_SOC_SAMSUNG_TM2_WM5110 config SND_SOC_SAMSUNG_TM2_WM5110
tristate "SoC I2S Audio support for WM5110 on TM2 board" tristate "SoC I2S Audio support for WM5110 on TM2 board"
depends on SND_SOC_SAMSUNG && MFD_ARIZONA && I2C && SPI_MASTER depends on SND_SOC_SAMSUNG && MFD_ARIZONA && MFD_WM5110 && I2C && SPI_MASTER
depends on GPIOLIB || COMPILE_TEST depends on GPIOLIB || COMPILE_TEST
select SND_SOC_MAX98504 select SND_SOC_MAX98504
select SND_SOC_WM5110 select SND_SOC_WM5110
......
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