From patchwork Tue May 5 00:19:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: yang.a.fang@intel.com X-Patchwork-Id: 6330761 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B043ABEEE1 for ; Tue, 5 May 2015 00:20:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CBD28202DD for ; Tue, 5 May 2015 00:20:24 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 925C42028D for ; Tue, 5 May 2015 00:20:23 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id C98512608BC; Tue, 5 May 2015 02:20:21 +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 31F3D2606F4; Tue, 5 May 2015 02:20:13 +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 B5E3E2606FE; Tue, 5 May 2015 02:20:10 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by alsa0.perex.cz (Postfix) with ESMTP id AC86D2606D9 for ; Tue, 5 May 2015 02:20:02 +0200 (CEST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 04 May 2015 17:20:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,368,1427785200"; d="scan'208";a="720664088" Received: from mocha.sc.intel.com ([143.183.245.87]) by fmsmga002.fm.intel.com with ESMTP; 04 May 2015 17:20:00 -0700 From: yang.a.fang@intel.com To: broonie@kernel.org, lgirdwood@gmail.com Date: Mon, 4 May 2015 17:19:20 -0700 Message-Id: <1430785160-72477-1-git-send-email-yang.a.fang@intel.com> X-Mailer: git-send-email 1.7.9.5 Cc: alsa-devel@alsa-project.org, srinivas.sripathi@intel.com, vinod.koul@intel.com, praveen.k.jain@intel.com, denny.iriawan@intel.com, "Fang, Yang A" , sathyanarayana.nujella@intel.com, kevin.strasser@linux.intel.com Subject: [alsa-devel] [PATCH] ASoC: Intel: Enabled button jack for BSW platform with rt5650 codec 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 From: "Fang, Yang A" rt5650 codec supports 4 buttons detections so enabled it Signed-off-by: Fang, Yang A --- sound/soc/intel/boards/cht_bsw_rt5645.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c index 8f96c21..1468c3d 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5645.c +++ b/sound/soc/intel/boards/cht_bsw_rt5645.c @@ -43,6 +43,7 @@ struct cht_acpi_card { struct cht_mc_private { struct snd_soc_jack hp_jack; struct snd_soc_jack mic_jack; + struct snd_soc_jack btn_jack; struct cht_acpi_card *acpi_card; }; @@ -182,6 +183,7 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) struct snd_soc_codec *codec = runtime->codec; struct snd_soc_dai *codec_dai = runtime->codec_dai; struct cht_mc_private *ctx = snd_soc_card_get_drvdata(runtime->card); + struct snd_soc_jack *btn_jack; /* Select clk_i2s1_asrc as ASRC clock source */ rt5645_sel_asrc_clk_src(codec, @@ -214,7 +216,26 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) return ret; } - rt5645_set_jack_detect(codec, &ctx->hp_jack, &ctx->mic_jack, NULL); + if (ctx->acpi_card->codec_type == CODEC_TYPE_RT5650) { + + ret = snd_soc_card_jack_new(runtime->card, "Button Jack", + SND_JACK_BTN_0 | + SND_JACK_BTN_1 | + SND_JACK_BTN_2 | + SND_JACK_BTN_3, &ctx->btn_jack, + NULL, 0); + if (ret) { + dev_err(runtime->dev, + "Btn jack creation failed %d\n", ret); + return ret; + } + + btn_jack = &ctx->btn_jack; + } else { + btn_jack = NULL; + } + + rt5645_set_jack_detect(codec, &ctx->hp_jack, &ctx->mic_jack, btn_jack); return ret; }