[PATCH] ARM: shmobile: only select sound drivers that build

[PATCH] ARM: shmobile: only select sound drivers that build

[Arnd Bergmann]

A couple of codec drivers are selected by shmobile platform code,
but depend on I2C, which results in a build error:

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

This ensures that we do not enable the respective drivers when I2C
is disabled.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
If this patch looks good, please add it to the shmobile git

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 679b866399f2..ca2182078547 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -150,7 +150,7 @@ config MACH_ARMADILLO800EVA
 	select ARCH_REQUIRE_GPIOLIB
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 	select SMSC_PHY if SH_ETH
-	select SND_SOC_WM8978 if SND_SIMPLE_CARD
+	select SND_SOC_WM8978 if SND_SIMPLE_CARD && I2C
 	select USE_OF
 
 config MACH_BOCKW
@@ -158,8 +158,8 @@ config MACH_BOCKW
 	depends on ARCH_R8A7778
 	select ARCH_REQUIRE_GPIOLIB
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
-	select SND_SOC_AK4554 if SND_SIMPLE_CARD
-	select SND_SOC_AK4642 if SND_SIMPLE_CARD
+	select SND_SOC_AK4554 if SND_SIMPLE_CARD && I2C
+	select SND_SOC_AK4642 if SND_SIMPLE_CARD && I2C
 	select USE_OF
 
 config MACH_BOCKW_REFERENCE

[PATCH] ARM: shmobile: only select sound drivers that build

[Geert Uytterhoeven]

Hi Arnd,

On Tue, May 19, 2015 at 2:49 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> A couple of codec drivers are selected by shmobile platform code,
> but depend on I2C, which results in a build error:

> --- a/arch/arm/mach-shmobile/Kconfig
> +++ b/arch/arm/mach-shmobile/Kconfig

> @@ -158,8 +158,8 @@ config MACH_BOCKW
>         depends on ARCH_R8A7778
>         select ARCH_REQUIRE_GPIOLIB
>         select REGULATOR_FIXED_VOLTAGE if REGULATOR
> -       select SND_SOC_AK4554 if SND_SIMPLE_CARD
> -       select SND_SOC_AK4642 if SND_SIMPLE_CARD
> +       select SND_SOC_AK4554 if SND_SIMPLE_CARD && I2C

AK4554 is not an i2c device, but a plain platform device.

> +       select SND_SOC_AK4642 if SND_SIMPLE_CARD && I2C
>         select USE_OF

The others are OK, so if you have remove AK4554, you can add my
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

[PATCH] ARM: shmobile: only select sound drivers that build

[Arnd Bergmann]

On Tuesday 19 May 2015 15:34:00 Geert Uytterhoeven wrote:
> On Tue, May 19, 2015 at 2:49 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> > A couple of codec drivers are selected by shmobile platform code,
> > but depend on I2C, which results in a build error:
> 
> > --- a/arch/arm/mach-shmobile/Kconfig
> > +++ b/arch/arm/mach-shmobile/Kconfig
> 
> > @@ -158,8 +158,8 @@ config MACH_BOCKW
> >         depends on ARCH_R8A7778
> >         select ARCH_REQUIRE_GPIOLIB
> >         select REGULATOR_FIXED_VOLTAGE if REGULATOR
> > -       select SND_SOC_AK4554 if SND_SIMPLE_CARD
> > -       select SND_SOC_AK4642 if SND_SIMPLE_CARD
> > +       select SND_SOC_AK4554 if SND_SIMPLE_CARD && I2C
> 
> AK4554 is not an i2c device, but a plain platform device.
> 
> > +       select SND_SOC_AK4642 if SND_SIMPLE_CARD && I2C
> >         select USE_OF
> 
> The others are OK, so if you have remove AK4554, you can add my
> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
> 
> 

Ah, my mistake. I've sent a fixed version 2 now.

Thanks!

	Arnd

[GIT PULL] Renesas ARM Based SoC Updates for v4.2

[Simon Horman]

Hi Olof, Hi Kevin, Hi Arnd,

Please consider these Renesas ARM based SoC updates for v4.2.

This small pull-request consists of a Kconfig fix from Arnd.
>From my point of view does not seem severe enough to go through
a fixes channel.


The following changes since commit b787f68c36d49bb1d9236f403813641efa74a031:

  Linux 4.1-rc1 (2015-04-26 17:59:10 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v4.2

for you to fetch changes up to 66f72f0c8e0d37339b6be1373c61d2a133c8b422:

  ARM: shmobile: only select sound drivers that build (2015-05-25 10:36:01 +0900)

----------------------------------------------------------------
Renesas ARM Based SoC Updates for v4.2

* Only select sound drivers that build

----------------------------------------------------------------
Arnd Bergmann (1):
      ARM: shmobile: only select sound drivers that build

 arch/arm/mach-shmobile/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[PATCH] ARM: shmobile: only select sound drivers that build

[Simon Horman]

From: Arnd Bergmann <arnd@arndb.de>

A couple of codec drivers are selected by shmobile platform code,
but depend on I2C, which results in a build error:

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

This ensures that we do not enable the respective drivers when I2C
is disabled.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 0fb484221c90..45006479d461 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -139,7 +139,7 @@ config MACH_ARMADILLO800EVA
 	select ARCH_REQUIRE_GPIOLIB
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 	select SMSC_PHY if SH_ETH
-	select SND_SOC_WM8978 if SND_SIMPLE_CARD
+	select SND_SOC_WM8978 if SND_SIMPLE_CARD && I2C
 	select USE_OF
 
 config MACH_BOCKW
@@ -148,7 +148,7 @@ config MACH_BOCKW
 	select ARCH_REQUIRE_GPIOLIB
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 	select SND_SOC_AK4554 if SND_SIMPLE_CARD
-	select SND_SOC_AK4642 if SND_SIMPLE_CARD
+	select SND_SOC_AK4642 if SND_SIMPLE_CARD && I2C
 	select USE_OF
 
 config MACH_BOCKW_REFERENCE
-- 
2.1.4