| Message ID | 5616798.tmraH8vpuI@wuerfel (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
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@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 -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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
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 -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html