[PATCH] ASoC: Intel: Add I2C dependency to two new machines

[PATCH] ASoC: Intel: Add I2C dependency to two new machines

[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]
 static struct i2c_driver rt5640_i2c_driver = {
                          ^
cc1: some warnings being treated as errors

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
Cc: Mengdong Lin <mengdong.lin@intel.com>
---
 sound/soc/intel/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index e989ecf046c9..f86de1211b96 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -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
-- 
2.1.3

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH] ASoC: Intel: Add I2C dependency to two new machines

[Randy Dunlap]

On 12/18/14 06:40, Jarkko Nikula wrote:
> 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 <jarkko.nikula@linux.intel.com>
> Reported-by: Randy Dunlap <rdunlap@infradead.org>

Acked-by: Randy Dunlap <rdunlap@infradead.org>

Thanks.

> Cc: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
> Cc: Mengdong Lin <mengdong.lin@intel.com>
> ---
>  sound/soc/intel/Kconfig | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
> index e989ecf046c9..f86de1211b96 100644
> --- a/sound/soc/intel/Kconfig
> +++ b/sound/soc/intel/Kconfig
> @@ -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
> 


-- 
~Randy
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH] ASoC: Intel: Add I2C dependency to two new machines

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 141 bytes --]

On Thu, Dec 18, 2014 at 04:40:35PM +0200, Jarkko Nikula wrote:
> Fix following build error when CONFIG_I2C is not enabled:

Applied, thanks.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]