From patchwork Tue Aug 29 19:29:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 111247 Delivered-To: patch@linaro.org Received: by 10.140.95.112 with SMTP id h103csp1832143qge; Tue, 29 Aug 2017 12:30:46 -0700 (PDT) X-Google-Smtp-Source: ADKCNb67WEAVjQIV6Gddc7cx0JVeCReW9S0IPtSeXolCOls+Vv1+jT3Gn0vytsSLDkLl1jzf5I4C X-Received: by 10.28.92.85 with SMTP id q82mr358377wmb.154.1504035045889; Tue, 29 Aug 2017 12:30:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504035045; cv=none; d=google.com; s=arc-20160816; b=A5oy+CFPvAT9HasHO3KK9+Vs+4OyECmw98oXjeaMLkcqLs0ODngUY/fZBk5/KBDnCf nxfS4t88d1ZSjGgYM/chp8HHSGqiV1lf0JzRdMDwISx4L1QICTl97ZhnGtSNHa0jSbsu 0esQ4e+1dAaZqNCxyKTn0fyzB/fS6fOaBbbzXLqKWsN+A0PowtmKfEVvk4ay9Khkl2+d PE5AM3X7cyEZ2nTt13Rml7T22dFn56xcyPsCuk3QzWQXNct2c8FwsgQJMqVV3jXJhCcH qDitN9mMTNv0oLLBdDyP1jt4Z/HSbxPb0r9LuRvLR4zQdl/rKpU5MwpnxZ/dS0hxTQKg KB0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=JNFhpiq+WurJuPh/tRjNf+dwoKPlWDROxzinyt7B4GA=; b=o+tIiqLGnOF/mtvcIo0xf7pwz5Oyat27ZCmBN8N7y2jFm0eDbSiFVgMwe1C8Z6hA7V hmwNPuwvBgkyvksRo0X/3aqgZGLKUDbOojE0EA1O8krAwqKgFIN7jSbDrJs8eGcPJQmV QULonHFZq/KKVbwQBrkZkJ4WBXRMYllWhw93+yPC3FOl08va4HnXaH+ciE+MU9ebvJDu awyOKx3xUejYO+4fsw12sMXv/yzQXuysME2PfayCG+o90ke5TChNhDj+EluqWDbOG+n5 m5lBDHW8buYv8rJRcK1C1Nw+TfsBMHlZH66xllgOduQpoEv+kbAj6HHii83ZZR9QQLjA lJAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=BSY+wxpQ; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id o18si3004021wrf.107.2017.08.29.12.30.45; Tue, 29 Aug 2017 12:30:45 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=BSY+wxpQ; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id CB5B3267021; Tue, 29 Aug 2017 21:30:12 +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 17DB4267021; Tue, 29 Aug 2017 21:30:12 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RP_MATCHES_RCVD, SPF_PASS, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 537A8267048 for ; Tue, 29 Aug 2017 21:29:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=nolpPtVmxqqAY8KsCx3NN/89YhE5RL018QoTl1l2dNQ=; b=BSY+wxpQdkpy 6j/pLMvDgRdKkbaJOYCwfLVbIXS5snAtBRCsKAjUcbmNCHKfOW+Bi86YVEHypdhnTalFiOjSblNpM uvNheb8P8TH4Spxgsi8stuqniMZdOZxDrdCqrLW8QwAGLve2DCPA6qr2v11l/PnRANM+wYbR84ORy LfC9c=; Received: from 92.40.248.112.threembb.co.uk ([92.40.248.112] helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1dmmCt-0003yX-2U; Tue, 29 Aug 2017 19:29:51 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 20DEF4400E7; Tue, 29 Aug 2017 20:29:50 +0100 (BST) From: Mark Brown To: Naveen M In-Reply-To: <1503700450-7964-3-git-send-email-naveen.m@intel.com> Message-Id: <20170829192950.20DEF4400E7@finisterre.ee.mobilebroadband> Date: Tue, 29 Aug 2017 20:29:50 +0100 (BST) Cc: alsa-devel@alsa-project.org, vinod.koul@intel.com, liam.r.girdwood@linux.intel.com, tiwai@suse.de, broonie@kernel.org, naveen.m@intel.com, pierre-louis.bossart@intel.com Subject: [alsa-devel] Applied "ASoC: Intel: kbl: Add jack port initialize in kbl machine drivers" to the asoc tree 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 The patch ASoC: Intel: kbl: Add jack port initialize in kbl machine drivers has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 3a13347f05fdba9d889891245f154816197868f4 Mon Sep 17 00:00:00 2001 From: Naveen M Date: Sat, 26 Aug 2017 04:04:10 +0530 Subject: [PATCH] ASoC: Intel: kbl: Add jack port initialize in kbl machine drivers After the pcm jack is created, create and initialize the pin switch widget for each port. For hdmi audio, invoke hdac_hdmi_jack_port_init func() in rt5663_max98927 & rt5663_rt5514_max98927 to enable the pin, when monitor is connected. Signed-off-by: Naveen M Acked-By: Vinod Koul Signed-off-by: Mark Brown --- sound/soc/intel/boards/kbl_rt5663_max98927.c | 7 ++++++- sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) -- 2.13.2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c index 941480c3e906..3fa85c32b9f8 100644 --- a/sound/soc/intel/boards/kbl_rt5663_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c @@ -767,10 +767,12 @@ static int kabylake_card_late_probe(struct snd_soc_card *card) { struct kbl_rt5663_private *ctx = snd_soc_card_get_drvdata(card); struct kbl_hdmi_pcm *pcm; + struct snd_soc_codec *codec = NULL; int err, i = 0; char jack_name[NAME_SIZE]; list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) { + codec = pcm->codec_dai->codec; snprintf(jack_name, sizeof(jack_name), "HDMI/DP, pcm=%d Jack", pcm->device); err = snd_soc_card_jack_new(card, jack_name, @@ -788,7 +790,10 @@ static int kabylake_card_late_probe(struct snd_soc_card *card) i++; } - return 0; + if (!codec) + return -EINVAL; + + return hdac_hdmi_jack_port_init(codec, &card->dapm); } /* kabylake audio machine driver for SPT + RT5663 */ diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c index d042255235c1..11bd5ef1e3b2 100644 --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c @@ -600,10 +600,12 @@ static int kabylake_card_late_probe(struct snd_soc_card *card) { struct kbl_codec_private *ctx = snd_soc_card_get_drvdata(card); struct kbl_hdmi_pcm *pcm; + struct snd_soc_codec *codec = NULL; int err, i = 0; char jack_name[NAME_SIZE]; list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) { + codec = pcm->codec_dai->codec; err = snd_soc_card_jack_new(card, jack_name, SND_JACK_AVOUT, &ctx->kabylake_hdmi[i], NULL, 0); @@ -617,7 +619,10 @@ static int kabylake_card_late_probe(struct snd_soc_card *card) i++; } - return 0; + if (!codec) + return -EINVAL; + + return hdac_hdmi_jack_port_init(codec, &card->dapm); } /*