Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f410d5c9 authored by Stephen Warren's avatar Stephen Warren Committed by Mark Brown
Browse files

ASoC: Intel: don't select RT5640 if !I2C 



The rt5640 driver won't compile without I2C enabled. Hence, the Intel
Haswell and Baytrail+RT5640 ASoC drivers must also depend on I2C, since
these select RT5640.

This solves:
sound/soc/codecs/rt5640.c:2220:1: warning: data definition has no type or storage class [enabled by default]
sound/soc/codecs/rt5640.c:2220:1: error: type defaults to ‘int’ in declaration of ‘module_i2c_driver’ [-Werror=implicit-int]
sound/soc/codecs/rt5640.c:2220:1: warning: parameter names (without types) in function declaration [enabled by default]
sound/soc/codecs/rt5640.c:2210:26: warning: ‘rt5640_i2c_driver’ defined but not used [-Wunused-variable]

Reported-by: default avatarJim Davis <jim.epost@gmail.com>
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent a8282136

sound/soc/intel/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ config SND_SOC_INTEL_BAYTRAIL 


config SND_SOC_INTEL_HASWELL_MACH

	tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint"

	depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS

	depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS && I2C

	select SND_SOC_INTEL_HASWELL

	select SND_SOC_RT5640

	help
@@ -43,7 +43,7 @@ config SND_SOC_INTEL_HASWELL_MACH 


config SND_SOC_INTEL_BYT_RT5640_MACH

	tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec"

	depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS

	depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS && I2C

	select SND_SOC_INTEL_BAYTRAIL

	select SND_SOC_RT5640

	help