From patchwork Mon Jun 23 13:29:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Nikula X-Patchwork-Id: 4402671 Return-Path: X-Original-To: patchwork-alsa-devel@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 BCCAFBEEAA for ; Mon, 23 Jun 2014 13:33:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D197F202DD for ; Mon, 23 Jun 2014 13:33:36 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id DF33E202A7 for ; Mon, 23 Jun 2014 13:33:29 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id F0338265506; Mon, 23 Jun 2014 15:33:28 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,NO_DNS_FOR_FROM, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id AB30B265588; Mon, 23 Jun 2014 15:31:40 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id EC5FD265553; Mon, 23 Jun 2014 15:31:38 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by alsa0.perex.cz (Postfix) with ESMTP id 0EC60261A96 for ; Mon, 23 Jun 2014 15:30:19 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 23 Jun 2014 06:24:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,530,1400050800"; d="scan'208";a="561879546" Received: from mylly.fi.intel.com (HELO mylly.fi.intel.com.) ([10.237.72.57]) by orsmga002.jf.intel.com with ESMTP; 23 Jun 2014 06:30:06 -0700 From: Jarkko Nikula To: alsa-devel@alsa-project.org Date: Mon, 23 Jun 2014 16:29:42 +0300 Message-Id: <1403530182-5400-6-git-send-email-jarkko.nikula@linux.intel.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1403530182-5400-1-git-send-email-jarkko.nikula@linux.intel.com> References: <1403530182-5400-1-git-send-email-jarkko.nikula@linux.intel.com> Cc: Mark Brown , Jarkko Nikula , Liam Girdwood , Kevin Strasser Subject: [alsa-devel] [PATCH 6/6] ASoC: Intel: byt-max98090: Do not enable MAX98090 microphone detection X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP It turned out there is no need to enable microphone detection in MAX98090 codec. Headset microphone is anyway detected by a GPIO signal from another chip and headset button presses cannot be detected either because a signal needed for it is not connected. Signed-off-by: Jarkko Nikula --- sound/soc/intel/byt-max98090.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sound/soc/intel/byt-max98090.c b/sound/soc/intel/byt-max98090.c index deb1db9a9a97..b8b8af571ef1 100644 --- a/sound/soc/intel/byt-max98090.c +++ b/sound/soc/intel/byt-max98090.c @@ -110,13 +110,9 @@ static int byt_max98090_init(struct snd_soc_pcm_runtime *runtime) if (ret) return ret; - ret = snd_soc_jack_add_gpiods(card->dev->parent, jack, - ARRAY_SIZE(hs_jack_gpios), - hs_jack_gpios); - if (ret) - return ret; - - return max98090_mic_detect(codec, jack); + return snd_soc_jack_add_gpiods(card->dev->parent, jack, + ARRAY_SIZE(hs_jack_gpios), + hs_jack_gpios); } static struct snd_soc_dai_link byt_max98090_dais[] = {