From patchwork Sat Apr 26 07:21:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xia Kaixu X-Patchwork-Id: 29138 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f70.google.com (mail-qa0-f70.google.com [209.85.216.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0341B20534 for ; Sat, 26 Apr 2014 07:22:36 +0000 (UTC) Received: by mail-qa0-f70.google.com with SMTP id dc16sf1151725qab.5 for ; Sat, 26 Apr 2014 00:22:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=K7kZuqw7Us237JKKmyf5Up6resZrZgUfO2SpOPsNHpo=; b=dqdczU0Xs66l2jaXGkeHdRHn2BcmUpOk5PnwW1SwOY/BSYSoVYmcW4cL9tUvKG0+Z5 GeMz5O1neY+EOHDbO0YFM2fqC3ITASHDxHZubAcTfN9Nulev0hc63XruO1fmGxC00d53 y83L5qpLUOiuL/PcYZKg4hOKzn5Vnswhyetl66Eiw3HlvcWjeX1EN3ErYag/6HqSQ4oG KsWr790je8BR3S7S8jfoCyMmkrLH3swPPkI5kz8cxrG6WAQZmEm30vD68DqgmSl5s2d7 v6HJt3LxeQ/9Aefvq28ZbsVBmRm5MM89joEA+aL/aooijTODFwB7zuKApFXXOXnUqMIz dDUA== X-Gm-Message-State: ALoCoQlc91rMLgnmeWoD6G/qlZ3p6sWwdiJSZolOyq8PgIvUI2Q3faRZIplXH4bMwmoboY7+lAhH X-Received: by 10.236.32.236 with SMTP id o72mr5750724yha.42.1398496956728; Sat, 26 Apr 2014 00:22:36 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.35.210 with SMTP id n76ls2002846qgn.15.gmail; Sat, 26 Apr 2014 00:22:36 -0700 (PDT) X-Received: by 10.220.191.134 with SMTP id dm6mr11049961vcb.16.1398496956654; Sat, 26 Apr 2014 00:22:36 -0700 (PDT) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id e9si2293196vcf.49.2014.04.26.00.22.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 26 Apr 2014 00:22:36 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.128.177; Received: by mail-ve0-f177.google.com with SMTP id sa20so5764804veb.36 for ; Sat, 26 Apr 2014 00:22:36 -0700 (PDT) X-Received: by 10.58.122.164 with SMTP id lt4mr10977151veb.2.1398496956570; Sat, 26 Apr 2014 00:22:36 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp152754vcb; Sat, 26 Apr 2014 00:22:36 -0700 (PDT) X-Received: by 10.66.120.201 with SMTP id le9mr12491952pab.98.1398496955853; Sat, 26 Apr 2014 00:22:35 -0700 (PDT) Received: from mail-pd0-f175.google.com (mail-pd0-f175.google.com [209.85.192.175]) by mx.google.com with ESMTPS id bn5si6347815pbb.366.2014.04.26.00.22.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 26 Apr 2014 00:22:35 -0700 (PDT) Received-SPF: none (google.com: kaixu.xia@linaro.org does not designate permitted sender hosts) client-ip=209.85.192.175; Received: by mail-pd0-f175.google.com with SMTP id fp1so1741966pdb.6 for ; Sat, 26 Apr 2014 00:22:35 -0700 (PDT) X-Received: by 10.68.162.34 with SMTP id xx2mr16348973pbb.120.1398496955480; Sat, 26 Apr 2014 00:22:35 -0700 (PDT) Received: from localhost.localdomain ([218.17.215.175]) by mx.google.com with ESMTPSA id bc4sm20640376pbb.2.2014.04.26.00.22.32 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 26 Apr 2014 00:22:34 -0700 (PDT) From: Xia Kaixu To: linaro-kernel@lists.linaro.org, arnd@arndb.de Cc: kaixu.xia@linaro.org, patches@linaro.org Subject: [PATCH 08/15] ASoC: missing codec dependencies Date: Sat, 26 Apr 2014 15:21:42 +0800 Message-Id: <1398496909-27785-9-git-send-email-kaixu.xia@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1398496909-27785-1-git-send-email-kaixu.xia@linaro.org> References: <1398496909-27785-1-git-send-email-kaixu.xia@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: kaixu.xia@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Arnd Bergmann We should not just 'select' a codec that has external dependencies if those are not met, so meet the complete dependency list. Signed-off-by: Arnd Bergmann Signed-off-by: Xia Kaixu Cc: Mark Brown Cc: Liam Girdwood Cc: Ben Dooks Cc: Kukjin Kim Cc: Sangbeom Kim Cc: Lars-Peter Clausen Cc: Timur Tabi Cc: alsa-devel@alsa-project.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org --- sound/soc/codecs/Kconfig | 4 ++-- sound/soc/fsl/Kconfig | 2 +- sound/soc/samsung/Kconfig | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index d06cd81..d4260d3 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -282,7 +282,7 @@ config SND_SOC_CS42L51 config SND_SOC_CS42L52 tristate "Cirrus Logic CS42L52 CODEC" - depends on I2C + depends on I2C && INPUT config SND_SOC_CS42L73 tristate "Cirrus Logic CS42L73 CODEC" @@ -598,7 +598,7 @@ config SND_SOC_WM8961 config SND_SOC_WM8962 tristate "Wolfson Microelectronics WM8962 CODEC" - depends on I2C + depends on I2C && INPUT config SND_SOC_WM8971 tristate diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 338a916..f4069d0 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -187,7 +187,7 @@ config SND_SOC_EUKREA_TLV320 config SND_SOC_IMX_WM8962 tristate "SoC Audio support for i.MX boards with wm8962" - depends on OF && I2C + depends on OF && I2C && INPUT select SND_SOC_WM8962 select SND_SOC_IMX_PCM_DMA select SND_SOC_IMX_AUDMUX diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index 42a544a..b09b5a4 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig @@ -130,7 +130,7 @@ config SND_SOC_SAMSUNG_SIMTEC_HERMES config SND_SOC_SAMSUNG_H1940_UDA1380 tristate "Audio support for the HP iPAQ H1940" - depends on SND_SOC_SAMSUNG && ARCH_H1940 + depends on SND_SOC_SAMSUNG && ARCH_H1940 && I2C select SND_S3C24XX_I2S select SND_SOC_UDA1380 help @@ -138,7 +138,7 @@ config SND_SOC_SAMSUNG_H1940_UDA1380 config SND_SOC_SAMSUNG_RX1950_UDA1380 tristate "Audio support for the HP iPAQ RX1950" - depends on SND_SOC_SAMSUNG && MACH_RX1950 + depends on SND_SOC_SAMSUNG && MACH_RX1950 && I2C select SND_S3C24XX_I2S select SND_SOC_UDA1380 help @@ -206,7 +206,7 @@ config SND_SOC_SPEYSIDE config SND_SOC_TOBERMORY tristate "Audio support for Wolfson Tobermory" - depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 + depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && INPUT select SND_SAMSUNG_I2S select SND_SOC_WM8962