The patch
ASoC: Fix SND_SOC_ALL_CODECS imply I2C fallout
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.7
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
From 1d0158f547e0dbefa9e18930e93f270ab0309707 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven geert@linux-m68k.org Date: Wed, 12 Feb 2020 15:56:49 +0100 Subject: [PATCH] ASoC: Fix SND_SOC_ALL_CODECS imply I2C fallout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit
Fixes for CONFIG_I2C=n:
WARNING: unmet direct dependencies detected for REGMAP_I2C Depends on [n]: I2C [=n] Selected by [m]: - SND_SOC_ADAU1781_I2C [=m] && SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] - SND_SOC_ADAU1977_I2C [=m] && SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] - SND_SOC_RT5677 [=m] && SOUND [=m] && !UML && SND [=m] && SND_SOC [=m]
sound/soc/codecs/...: error: type defaults to ‘int’ in declaration of ‘module_i2c_driver’ [-Werror=implicit-int]
drivers/base/regmap/regmap-i2c.c: In function ‘regmap_smbus_byte_reg_read’: drivers/base/regmap/regmap-i2c.c:25:8: error: implicit declaration of function ‘i2c_smbus_read_byte_data’; did you mean ‘i2c_set_adapdata’? [-Werror=implicit-function-declaration]
Fixes: ea00d95200d02ece ("ASoC: Use imply for SND_SOC_ALL_CODECS") Signed-off-by: Geert Uytterhoeven geert@linux-m68k.org Link: https://lore.kernel.org/r/20200212145650.4602-3-geert@linux-m68k.org Signed-off-by: Mark Brown broonie@kernel.org --- sound/soc/codecs/Kconfig | 9 +++++++++ 1 file changed, 9 insertions(+)
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index c2fb985de8c4..3ef804d07dee 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -339,6 +339,7 @@ config SND_SOC_AD193X_SPI
config SND_SOC_AD193X_I2C tristate + depends on I2C select SND_SOC_AD193X
config SND_SOC_AD1980 @@ -353,6 +354,7 @@ config SND_SOC_ADAU_UTILS
config SND_SOC_ADAU1373 tristate + depends on I2C select SND_SOC_ADAU_UTILS
config SND_SOC_ADAU1701 @@ -387,6 +389,7 @@ config SND_SOC_ADAU1781
config SND_SOC_ADAU1781_I2C tristate + depends on I2C select SND_SOC_ADAU1781 select REGMAP_I2C
@@ -407,6 +410,7 @@ config SND_SOC_ADAU1977_SPI
config SND_SOC_ADAU1977_I2C tristate + depends on I2C select SND_SOC_ADAU1977 select REGMAP_I2C
@@ -450,6 +454,7 @@ config SND_SOC_ADAV801
config SND_SOC_ADAV803 tristate + depends on I2C select SND_SOC_ADAV80X
config SND_SOC_ADS117X @@ -471,6 +476,7 @@ config SND_SOC_AK4458
config SND_SOC_AK4535 tristate + depends on I2C
config SND_SOC_AK4554 tristate "AKM AK4554 CODEC" @@ -481,6 +487,7 @@ config SND_SOC_AK4613
config SND_SOC_AK4641 tristate + depends on I2C
config SND_SOC_AK4642 tristate "AKM AK4642 CODEC" @@ -488,6 +495,7 @@ config SND_SOC_AK4642
config SND_SOC_AK4671 tristate + depends on I2C
config SND_SOC_AK5386 tristate "AKM AK5638 CODEC" @@ -1112,6 +1120,7 @@ config SND_SOC_RT5670
config SND_SOC_RT5677 tristate + depends on I2C select REGMAP_I2C select REGMAP_IRQ