Skip to contentSkip to conversation

ASoC: Fix dependency issues of SND_SOC

PATCH In review Wei Li 2 participants 4 messages Apr 20, 2020

Subsystems (2)
lore
Share & tools
lore

Wei Li

author
#0 lore raw

cover ASoC: Fix dependency issues of SND_SOC

Fix dependency issues of SND_SOC introduced by commit ea00d95200d02 ("ASoC: Use imply for SND_SOC_ALL_CODECS").

Wei Li (2):
ASoC: wm89xx: Fix build errors caused by I2C dependency
ASoC: Fix wrong dependency of da7210 and wm8983

 sound/soc/codecs/Kconfig | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 1/2 ASoC: wm89xx: Fix build errors caused by I2C dependency

When I2C=m, SND_SOC_WM8900=y, SND_SOC_WM8988=y, SND_SOC_WM8995=y:

sound/soc/codecs/wm8900.o: In function `wm8900_i2c_probe':
wm8900.c:(.text+0xa16): undefined reference to __devm_regmap_init_i2c' sound/soc/codecs/wm8900.o: In function wm8900_modinit':
wm8900.c:(.init.text+0xb): undefined reference to i2c_register_driver' sound/soc/codecs/wm8900.o: In function wm8900_exit':
wm8900.c:(.exit.text+0x8): undefined reference to i2c_del_driver' sound/soc/codecs/wm8988.o: In function wm8988_i2c_probe':
wm8988.c:(.text+0x86b): undefined reference to __devm_regmap_init_i2c' sound/soc/codecs/wm8988.o: In function wm8988_modinit':
wm8988.c:(.init.text+0xb): undefined reference to i2c_register_driver' sound/soc/codecs/wm8988.o: In function wm8988_exit':
wm8988.c:(.exit.text+0x8): undefined reference to i2c_del_driver' sound/soc/codecs/wm8995.o: In function wm8995_i2c_probe':
wm8995.c:(.text+0x1b5b): undefined reference to __devm_regmap_init_i2c' sound/soc/codecs/wm8995.o: In function wm8995_modinit':
wm8995.c:(.init.text+0xb): undefined reference to i2c_register_driver' sound/soc/codecs/wm8995.o: In function wm8995_exit':
wm8995.c:(.exit.text+0x8): undefined reference to `i2c_del_driver'

As these drivers support I2C and SPI, we add the SND_SOC_I2C_AND_SPI dependency to solve it.

Fixes ea00d95200d02 ("ASoC: Use imply for SND_SOC_ALL_CODECS")
---
 sound/soc/codecs/Kconfig | 3 +++
 1 file changed, 3 insertions(+)
sound/soc/codecs/Kconfig +3 -0
index e6a0c5d05fa5..e60e0b6a689c 100644
@@ -1525,6 +1525,7 @@ config SND_SOC_WM8804_SPI
 
 config SND_SOC_WM8900
 	tristate
+	depends on SND_SOC_I2C_AND_SPI
 
 config SND_SOC_WM8903
 	tristate "Wolfson Microelectronics WM8903 CODEC"
@@ -1576,6 +1577,7 @@ config SND_SOC_WM8985
 
 config SND_SOC_WM8988
 	tristate
+	depends on SND_SOC_I2C_AND_SPI
 
 config SND_SOC_WM8990
 	tristate
@@ -1594,6 +1596,7 @@ config SND_SOC_WM8994
 
 config SND_SOC_WM8995
 	tristate
+	depends on SND_SOC_I2C_AND_SPI
 
 config SND_SOC_WM8996
 	tristate
Signature · 1 line
2.17.1
author
#2 lore raw

PATCH 2/2 ASoC: Fix wrong dependency of da7210 and wm8983

In reply to Wei Li

As these two drivers support I2C and SPI, we should add the SND_SOC_I2C_AND_SPI dependency instead.

Fixes ce0c97f8a2936 ("ASoC: Fix SND_SOC_ALL_CODECS imply SPI fallout")
---
 sound/soc/codecs/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/Kconfig +2 -2
index e60e0b6a689c..d0fec1b90256 100644
@@ -717,7 +717,7 @@ config SND_SOC_L3
 
 config SND_SOC_DA7210
 	tristate
-	depends on I2C
+	depends on SND_SOC_I2C_AND_SPI
 
 config SND_SOC_DA7213
 	tristate "Dialog DA7213 CODEC"
@@ -1569,7 +1569,7 @@ config SND_SOC_WM8978
 
 config SND_SOC_WM8983
 	tristate
-	depends on I2C
+	depends on SND_SOC_I2C_AND_SPI
 
 config SND_SOC_WM8985
 	tristate "Wolfson Microelectronics WM8985 and WM8758 codec driver"
Signature · 1 line
2.17.1
maintainer
#3 lore raw
In reply to Wei Li
Quoted 8 lines · Wei Li

Fix dependency issues of SND_SOC introduced by commit ea00d95200d02 ("ASoC: Use imply for SND_SOC_ALL_CODECS").

Wei Li (2):
ASoC: wm89xx: Fix build errors caused by I2C dependency
ASoC: Fix wrong dependency of da7210 and wm8983

[...]

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.7

Thanks!

[1/2] ASoC: wm89xx: Add missing dependency

      commit: 9bff3d3024e51122c0c09634056debcd6c7359ec

[2/2] ASoC: Fix wrong dependency of da7210 and wm8983
(not applied)

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark