From patchwork Wed Mar 19 19:29:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 3860721 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 25E82BF549 for ; Wed, 19 Mar 2014 19:36:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7619420203 for ; Wed, 19 Mar 2014 19:36:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 94FBF201FA for ; Wed, 19 Mar 2014 19:36:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752042AbaCSTgX (ORCPT ); Wed, 19 Mar 2014 15:36:23 -0400 Received: from moutng.kundenserver.de ([212.227.17.24]:50120 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751305AbaCSTgW (ORCPT ); Wed, 19 Mar 2014 15:36:22 -0400 Received: from wuerfel.lan (HSI-KBW-134-3-135-108.hsi14.kabel-badenwuerttemberg.de [134.3.135.108]) by mrelayeu.kundenserver.de (node=mreue105) with ESMTP (Nemesis) id 0MPGl6-1WUjzO29Ka-004TxO; Wed, 19 Mar 2014 20:35:46 +0100 From: Arnd Bergmann To: arm@kernel.org Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Simon Horman , Magnus Damm , linux-sh@vger.kernel.org Subject: [PATCH 59/62] ARM: shmobile: ak4642 needs i2c support Date: Wed, 19 Mar 2014 20:29:56 +0100 Message-Id: <1395257399-359545-60-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1395257399-359545-1-git-send-email-arnd@arndb.de> References: <1395257399-359545-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:iFxpwehKpUbUHp89Tw78qoLAJ56ABPNa6+tTN7QWREd N0hiXxCIMXzpRfrh4b2Vw9rgAoQzXq4n0L04xQ/ny8yQo4Vd3T Lo641xIY6ZUqq0BGjdvJUZK5No/hEDy9o8KMFr2bMKPY1+DrRg Jbp74mNA0b1MUf/t+dXCCh5sShqpuT+WMuHlOlkEk+tncyTWTm f/uzood85muBp60TVJrVX1JM59oKUhA1CepUz+zXJposvNnDQh 5u6usv1CVFb0dwaOS54V24L6hd5nnOG6fnSgsx5AVKLPS6ttKL WOBe7tUCbGAv0uLIKTXTPhBbiCvs6/1Xu7J+IeB0SLnnwdgzYf h4JpoVKF79LlgsrGqHIZuCISl11lqTmOcw7kHsi+w Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We cannot select SND_SOC_AK4642 if the I2C core layer is disabled. Making the select statement conditional ensures that we can build all configurations. Signed-off-by: Arnd Bergmann Cc: Simon Horman Cc: Magnus Damm Cc: linux-sh@vger.kernel.org --- arch/arm/mach-shmobile/Kconfig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 5249ff0..6e3904e 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -170,7 +170,7 @@ config MACH_MACKEREL select ARCH_REQUIRE_GPIOLIB select REGULATOR_FIXED_VOLTAGE if REGULATOR select SMSC_PHY if SMSC911X - select SND_SOC_AK4642 if SND_SIMPLE_CARD + select SND_SOC_AK4642 if SND_SIMPLE_CARD && I2C=y select USE_OF config MACH_ARMADILLO800EVA @@ -179,7 +179,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=y select USE_OF config MACH_ARMADILLO800EVA_REFERENCE @@ -188,7 +188,7 @@ config MACH_ARMADILLO800EVA_REFERENCE 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=y select USE_OF ---help--- Use reference implementation of Aramdillo800 EVA board support @@ -204,7 +204,7 @@ config MACH_BOCKW select REGULATOR_FIXED_VOLTAGE if REGULATOR select RENESAS_INTC_IRQPIN 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=y select USE_OF config MACH_BOCKW_REFERENCE @@ -277,7 +277,7 @@ config MACH_KZM9G select ARCH_HAS_OPP select ARCH_REQUIRE_GPIOLIB select REGULATOR_FIXED_VOLTAGE if REGULATOR - select SND_SOC_AK4642 if SND_SIMPLE_CARD + select SND_SOC_AK4642 if SND_SIMPLE_CARD && I2C=y select USE_OF config MACH_KZM9G_REFERENCE @@ -285,7 +285,7 @@ config MACH_KZM9G_REFERENCE depends on ARCH_SH73A0 select ARCH_REQUIRE_GPIOLIB select REGULATOR_FIXED_VOLTAGE if REGULATOR - select SND_SOC_AK4642 if SND_SIMPLE_CARD + select SND_SOC_AK4642 if SND_SIMPLE_CARD && I2C=y select USE_OF ---help--- Use reference implementation of KZM-A9-GT board support