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

[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

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

[Arnd Bergmann]

On Thursday 28 May 2015 10:05:48 Simon Horman wrote:
> 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.
> 

Pulled into next/soc, thanks!

(I haven't started a fixes-non-critical branch yet, and it seems
few other things are coming for it)

	Arnd