From patchwork Tue Aug 29 19:29:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 111249 Delivered-To: patch@linaro.org Received: by 10.140.95.112 with SMTP id h103csp1832957qge; Tue, 29 Aug 2017 12:31:19 -0700 (PDT) X-Google-Smtp-Source: ADKCNb6nkvK4D0R2qS/x2RDqBR2e477S1CePBRZJDP1HQWScmm9NHYFoRJlir2lQecA9KLzBG53L X-Received: by 10.28.213.1 with SMTP id m1mr399780wmg.175.1504035078982; Tue, 29 Aug 2017 12:31:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504035078; cv=none; d=google.com; s=arc-20160816; b=xBz9sU41fPtJZOaxrrEpI/u3A+KSyWuedqYyRn4Mpo7X9RQKOm1HGESMpVMyUP2HSV Rg/A58eigT2/a9l4M7jR3MVNgVO/JNqaqDrqeFMe1W27o7RFl/sU5BBO3fDSCVT9vWWV 6Ia4GGhakOH88DAsREa5GCJ5iuXo/8VCxGsh5ZkFHDZyl73sN66xgwufzMC8y8Ej3RwH h9qGEzLqovhY8wadvxBN5JY31z+vXYlsePW8BxKIWz/yDRFz2ptjuypN8o7bc7eEiGi6 cKdA3R82Qh4g8Iz2iHLhGWrGIsdEBHPiCNvGXIm2Qx0PKl4GThu6KHvk0EvhxO8qKFcd ZDUA== 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=sbWZ2f5gppnB5JX4z5Ya57yAy0fLPgCvJ2V3dRhMgwU=; b=RpunePRMqzneg0jUs/43IMHuE1jmIRrrwIYAOStyfVBuTFazaPDXjKXHf/Q0vnzugu c0OHaN/eOc0gKSNGQJP+pFUtJsdSANNbULpfziFjltPfqqxfHhN+nKu9wDXVMP/cfRkg 8gMzMtQzeIdRmXPQByDRZ4zM5iHOO+0RY9NsaXd32YmxnqY36sLVXsoMbYJR6XPgZ1My dTEytVUD2HjhPEwDnIuettYa/lyJ+3SHeqXFZhOoE/hsJKJIu7T8BfXWLLR4bzrJ+rSz uJooxw4o9AP8Jcn1ZRXg0svBF+rXU5pYD7QADe3WQHsFnfkDV5oavEQ9hDUDSsyx715a OXkA== 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=i9HMVrlB; 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 w71si1775074wmw.130.2017.08.29.12.31.18; Tue, 29 Aug 2017 12:31:18 -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=i9HMVrlB; 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 7C4B82670CE; Tue, 29 Aug 2017 21:30:37 +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 7ADB92670BE; Tue, 29 Aug 2017 21:30:35 +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 4168426706F for ; Tue, 29 Aug 2017 21:30:02 +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=mhUeSlOGcW8A+bvVJbElXr7p7vqN+Vq0OVqPqBrUiBc=; b=i9HMVrlBwCFA vbdvQrwIb+aLrpi55FOQFK+MSyWFAk47SOwEzYA8EAU5RtoipOITffXcsV4ZYuP7n+XCm2wk1ProP e3kP5bD8KhcY4OKk0nV/8FdaYpUV/fZPDTkXHfE2Y9cHXuPmi9UnMERDE6VM9ZbXwTcfiI3Znt17z rU6EM=; 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 1dmmD2-0003yn-8C; Tue, 29 Aug 2017 19:30:01 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 56AF74400E7; Tue, 29 Aug 2017 20:29:59 +0100 (BST) From: Mark Brown To: Naveen M In-Reply-To: <1503700450-7964-2-git-send-email-naveen.m@intel.com> Message-Id: <20170829192959.56AF74400E7@finisterre.ee.mobilebroadband> Date: Tue, 29 Aug 2017 20:29:59 +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 MST route change to 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 MST route change to 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 c20252cf9230eb7abd8bce9fdb2ce9bdd6743689 Mon Sep 17 00:00:00 2001 From: Naveen M Date: Sat, 26 Aug 2017 04:04:09 +0530 Subject: [PATCH] ASoC: Intel: kbl: Add MST route change to kbl machine drivers To support MST hdmi audio, modify the current routes to be based on port in rt5663_max98927 & rt5663_rt5514_max98927 machine. Signed-off-by: Naveen M Acked-By: Vinod Koul Signed-off-by: Mark Brown --- sound/soc/intel/boards/kbl_rt5663_max98927.c | 8 +++----- sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 7 ++----- 2 files changed, 5 insertions(+), 10 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 c1442147d138..941480c3e906 100644 --- a/sound/soc/intel/boards/kbl_rt5663_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c @@ -74,8 +74,9 @@ static const struct snd_soc_dapm_widget kabylake_widgets[] = { SND_SOC_DAPM_SPK("Left Spk", NULL), SND_SOC_DAPM_SPK("Right Spk", NULL), SND_SOC_DAPM_MIC("SoC DMIC", NULL), - SND_SOC_DAPM_SPK("DP", NULL), - SND_SOC_DAPM_SPK("HDMI", NULL), + SND_SOC_DAPM_SPK("HDMI1", NULL), + SND_SOC_DAPM_SPK("HDMI2", NULL), + SND_SOC_DAPM_SPK("HDMI3", NULL), }; @@ -93,9 +94,6 @@ static const struct snd_soc_dapm_route kabylake_map[] = { { "IN1N", NULL, "Headset Mic" }, { "DMic", NULL, "SoC DMIC" }, - { "HDMI", NULL, "hif5 Output" }, - { "DP", NULL, "hif6 Output" }, - /* CODEC BE connections */ { "Left HiFi Playback", NULL, "ssp0 Tx" }, { "Right HiFi Playback", NULL, "ssp0 Tx" }, diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c index 69681b04d7fc..d042255235c1 100644 --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c @@ -85,8 +85,8 @@ static const struct snd_soc_dapm_widget kabylake_widgets[] = { SND_SOC_DAPM_SPK("Left Spk", NULL), SND_SOC_DAPM_SPK("Right Spk", NULL), SND_SOC_DAPM_MIC("DMIC", NULL), - SND_SOC_DAPM_SPK("DP", NULL), - SND_SOC_DAPM_SPK("HDMI", NULL), + SND_SOC_DAPM_SPK("HDMI1", NULL), + SND_SOC_DAPM_SPK("HDMI2", NULL), }; @@ -103,9 +103,6 @@ static const struct snd_soc_dapm_route kabylake_map[] = { { "IN1P", NULL, "Headset Mic" }, { "IN1N", NULL, "Headset Mic" }, - { "HDMI", NULL, "hif5 Output" }, - { "DP", NULL, "hif6 Output" }, - /* CODEC BE connections */ { "Left HiFi Playback", NULL, "ssp0 Tx" }, { "Right HiFi Playback", NULL, "ssp0 Tx" },