Commit 1d0158f5 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Mark Brown

ASoC: Fix SND_SOC_ALL_CODECS imply I2C fallout

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: ea00d952 ("ASoC: Use imply for SND_SOC_ALL_CODECS")
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20200212145650.4602-3-geert@linux-m68k.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent ce0c97f8
...@@ -339,6 +339,7 @@ config SND_SOC_AD193X_SPI ...@@ -339,6 +339,7 @@ config SND_SOC_AD193X_SPI
config SND_SOC_AD193X_I2C config SND_SOC_AD193X_I2C
tristate tristate
depends on I2C
select SND_SOC_AD193X select SND_SOC_AD193X
config SND_SOC_AD1980 config SND_SOC_AD1980
...@@ -353,6 +354,7 @@ config SND_SOC_ADAU_UTILS ...@@ -353,6 +354,7 @@ config SND_SOC_ADAU_UTILS
config SND_SOC_ADAU1373 config SND_SOC_ADAU1373
tristate tristate
depends on I2C
select SND_SOC_ADAU_UTILS select SND_SOC_ADAU_UTILS
config SND_SOC_ADAU1701 config SND_SOC_ADAU1701
...@@ -387,6 +389,7 @@ config SND_SOC_ADAU1781 ...@@ -387,6 +389,7 @@ config SND_SOC_ADAU1781
config SND_SOC_ADAU1781_I2C config SND_SOC_ADAU1781_I2C
tristate tristate
depends on I2C
select SND_SOC_ADAU1781 select SND_SOC_ADAU1781
select REGMAP_I2C select REGMAP_I2C
...@@ -407,6 +410,7 @@ config SND_SOC_ADAU1977_SPI ...@@ -407,6 +410,7 @@ config SND_SOC_ADAU1977_SPI
config SND_SOC_ADAU1977_I2C config SND_SOC_ADAU1977_I2C
tristate tristate
depends on I2C
select SND_SOC_ADAU1977 select SND_SOC_ADAU1977
select REGMAP_I2C select REGMAP_I2C
...@@ -450,6 +454,7 @@ config SND_SOC_ADAV801 ...@@ -450,6 +454,7 @@ config SND_SOC_ADAV801
config SND_SOC_ADAV803 config SND_SOC_ADAV803
tristate tristate
depends on I2C
select SND_SOC_ADAV80X select SND_SOC_ADAV80X
config SND_SOC_ADS117X config SND_SOC_ADS117X
...@@ -471,6 +476,7 @@ config SND_SOC_AK4458 ...@@ -471,6 +476,7 @@ config SND_SOC_AK4458
config SND_SOC_AK4535 config SND_SOC_AK4535
tristate tristate
depends on I2C
config SND_SOC_AK4554 config SND_SOC_AK4554
tristate "AKM AK4554 CODEC" tristate "AKM AK4554 CODEC"
...@@ -481,6 +487,7 @@ config SND_SOC_AK4613 ...@@ -481,6 +487,7 @@ config SND_SOC_AK4613
config SND_SOC_AK4641 config SND_SOC_AK4641
tristate tristate
depends on I2C
config SND_SOC_AK4642 config SND_SOC_AK4642
tristate "AKM AK4642 CODEC" tristate "AKM AK4642 CODEC"
...@@ -488,6 +495,7 @@ config SND_SOC_AK4642 ...@@ -488,6 +495,7 @@ config SND_SOC_AK4642
config SND_SOC_AK4671 config SND_SOC_AK4671
tristate tristate
depends on I2C
config SND_SOC_AK5386 config SND_SOC_AK5386
tristate "AKM AK5638 CODEC" tristate "AKM AK5638 CODEC"
...@@ -1112,6 +1120,7 @@ config SND_SOC_RT5670 ...@@ -1112,6 +1120,7 @@ config SND_SOC_RT5670
config SND_SOC_RT5677 config SND_SOC_RT5677
tristate tristate
depends on I2C
select REGMAP_I2C select REGMAP_I2C
select REGMAP_IRQ select REGMAP_IRQ
......
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