Skip to contentSkip to conversation

ASoC: Intel: Add I2C dependency to two new machines

PATCH Applied Jarkko Nikula 3 participants 3 messages Dec 18, 2014 – Dec 22, 2014

Subsystems (3)
Sound ASoC Intel ASoC drivers
lore
Share & tools
lore

Jarkko Nikula

author
#0 lore raw

PATCH 1/1 ASoC: Intel: Add I2C dependency to two new machines

Fix following build error when CONFIG_I2C is not enabled:

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

 static struct i2c_driver rt5640_i2c_driver = {
                          ^

cc1: some warnings being treated as errors

Signed-off-by Jarkko Nikula <[email protected]>
Reported-by Randy Dunlap <[email protected]>
Cc Subhransu S. Prusty <[email protected]>
Cc Mengdong Lin <[email protected]>
---
 sound/soc/intel/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/intel/Kconfig +2 -2
index e989ecf046c9..f86de1211b96 100644
@@ -89,7 +89,7 @@ config SND_SOC_INTEL_BROADWELL_MACH
 
 config SND_SOC_INTEL_BYTCR_RT5640_MACH
 	tristate "ASoC Audio DSP Support for MID BYT Platform"
-	depends on X86
+	depends on X86 && I2C
 	select SND_SOC_RT5640
 	select SND_SST_MFLD_PLATFORM
 	select SND_SST_IPC_ACPI

@@ -101,7 +101,7 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH
 
 config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
         tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec"
-        depends on X86_INTEL_LPSS
+        depends on X86_INTEL_LPSS && I2C
         select SND_SOC_RT5670
         select SND_SST_MFLD_PLATFORM
         select SND_SST_IPC_ACPI
Signature · 6 lines
2.1.3

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Jarkko Nikula

Fix following build error when CONFIG_I2C is not enabled:

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

Quoted 6 lines
 static struct i2c_driver rt5640_i2c_driver = {
                          ^

cc1: some warnings being treated as errors

Signed-off-by Jarkko Nikula <[email protected]>
Reported-by Randy Dunlap <[email protected]>
Acked-by Randy Dunlap <[email protected]>

Thanks.

Quoted 29 lines
Cc Subhransu S. Prusty <[email protected]>
Cc Mengdong Lin <[email protected]>
---
 sound/soc/intel/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/intel/Kconfig +2 -2
index e989ecf046c9..f86de1211b96 100644
@@ -89,7 +89,7 @@ config SND_SOC_INTEL_BROADWELL_MACH
 
 config SND_SOC_INTEL_BYTCR_RT5640_MACH
 	tristate "ASoC Audio DSP Support for MID BYT Platform"
-	depends on X86
+	depends on X86 && I2C
 	select SND_SOC_RT5640
 	select SND_SST_MFLD_PLATFORM
 	select SND_SST_IPC_ACPI

@@ -101,7 +101,7 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH
 
 config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
         tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec"
-        depends on X86_INTEL_LPSS
+        depends on X86_INTEL_LPSS && I2C
         select SND_SOC_RT5670
         select SND_SST_MFLD_PLATFORM
         select SND_SST_IPC_ACPI
Signature · 5 lines
~Randy
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel