From patchwork Tue Sep 19 13:46:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 9959129 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0AD1E6056A for ; Tue, 19 Sep 2017 13:54:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CBD8F28646 for ; Tue, 19 Sep 2017 13:54:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C00FA288C7; Tue, 19 Sep 2017 13:54:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D2C3F286AA for ; Tue, 19 Sep 2017 13:54:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Date:Message-Id: In-Reply-To:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: References:List-Owner; bh=Ehqt1+z2chtgXVkpXkMTCTFSe8Oud1SJM4dxG/89xSg=; b=Vr2 PNABiU7M1+IS4huhK3k/zJbykAg6RF+njTNzuIWZKnBvVKVnK8dbDfaZGZ3zSGwnNWGmIhRk/5+1w W2/9TlroPb96F3GdOy7oCRLemO7Jr2RM0nxZMUBSD6kTEnLozdHHZJ2rzQ1pk/w+xxCRthQviUVjz 3meRrZcfXXV/YF0OPEC4Ph9jMwzGTFW9BQzWnRerIVctLTmeW+ZzW41TQhdQUyPcplHirY7unpIsD um+M9wYaCaQbJ9mjHnS3Syq+DADdNBdeB+Hj/2msmkuvtPqaoKFrDlKiFMvqBuk8+bhuT2STaWebM VPmcf/LRpzIHMHubfGHO3y3LcEET+Pg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1duIzA-00017f-4Z; Tue, 19 Sep 2017 13:54:48 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1duIsO-0006Dv-Mj; Tue, 19 Sep 2017 13:47:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; 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=G0BHdWD1+NMwxr5wYfQSN5yp/dh7rZBuv1FDJgTCCxU=; b=hJylUqBtMwzIEF2LZAFcAjlx+1 e26+7f87ZWlnDe4GU3KNf/8gG84yZGa5FUgmkHqCnwRnencrt6x+hWNRmmzvweRWh3n1JvX9HZ24d UNnwU9dlak15fAjm+KFSY38LNkVH7nLzjK3yoPMtiaBY6PXCSsy7Ds0lVTziH70kS+L6Rvy+GKun/ roHZ0UzvKgUZxDFynpx9mKIbcTP/ibrG3pprXvE9tft2TWZ/rAvF7XkxvwERykExt5m/KJLM9nIb6 h1RWWzRg3K1FMfeiPeoK4FRdAAQ/vGqyz+Re4sBz10za28xIzsCuc5LfQ7jfKEE+FMhB3+NM5zh4z G8AdTXGQ==; Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1duIsH-0006DZ-PF; Tue, 19 Sep 2017 13:47:47 +0000 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=G0BHdWD1+NMwxr5wYfQSN5yp/dh7rZBuv1FDJgTCCxU=; b=qlJPvj9sK0KC ELqWA6UYQRNMWWk3nfj0ltS/Tq5yhlrow4iEls4/eOJZmWaIgYoclw92d1OizZI1QeLJoPKgwBk6/ 01D35xi78wFiZ8wUKOe/l+5r5/fQ3uUiwpwZ80eGwEchGAmohAH5y4hy9sQQXaOV6w9/wnsqiR3CL h9bIw=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1duIrE-0001Oj-KW; Tue, 19 Sep 2017 13:46:36 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1duIrE-0008H7-7j; Tue, 19 Sep 2017 14:46:36 +0100 From: Mark Brown To: Jeffy Chen Subject: Applied "ASoC: rockchip: Add dapm route for HDMI" to the asoc tree In-Reply-To: <20170918014441.17572-1-jeffy.chen@rock-chips.com> Message-Id: Date: Tue, 19 Sep 2017 14:46:36 +0100 X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170919_144741_842934_DA92CB3D X-CRM114-Status: GOOD ( 15.93 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, dianders@chromium.org, Heiko Stuebner , briannorris@chromium.org, Liam Girdwood , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Mark Brown , Takashi Iwai , mka@chromium.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The patch ASoC: rockchip: Add dapm route for HDMI 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 e7251484f3bc3bd9203a2c39555ca7d53e988cf6 Mon Sep 17 00:00:00 2001 From: Jeffy Chen Date: Mon, 18 Sep 2017 19:17:59 +0800 Subject: [PATCH] ASoC: rockchip: Add dapm route for HDMI Add dapm route for DP codec. Signed-off-by: Jeffy Chen Signed-off-by: Mark Brown --- sound/soc/rockchip/rk3399_gru_sound.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c index 1ca269ee0b7e..6463ea86a33a 100644 --- a/sound/soc/rockchip/rk3399_gru_sound.c +++ b/sound/soc/rockchip/rk3399_gru_sound.c @@ -47,6 +47,7 @@ static const struct snd_soc_dapm_widget rockchip_dapm_widgets[] = { SND_SOC_DAPM_SPK("Speakers", NULL), SND_SOC_DAPM_MIC("Headset Mic", NULL), SND_SOC_DAPM_MIC("Int Mic", NULL), + SND_SOC_DAPM_LINE("HDMI", NULL), }; static const struct snd_soc_dapm_route rockchip_dapm_routes[] = { @@ -60,6 +61,7 @@ static const struct snd_soc_dapm_route rockchip_dapm_routes[] = { {"Headphones", NULL, "HPL"}, {"Headphones", NULL, "HPR"}, {"Speakers", NULL, "Speaker"}, + {"HDMI", NULL, "TX"}, }; static const struct snd_kcontrol_new rockchip_controls[] = { @@ -67,6 +69,7 @@ static const struct snd_kcontrol_new rockchip_controls[] = { SOC_DAPM_PIN_SWITCH("Speakers"), SOC_DAPM_PIN_SWITCH("Headset Mic"), SOC_DAPM_PIN_SWITCH("Int Mic"), + SOC_DAPM_PIN_SWITCH("HDMI"), }; static int rockchip_sound_max98357a_hw_params(struct snd_pcm_substream *substream,