From patchwork Fri Apr 27 10:59:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10368145 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 20A78601BE for ; Fri, 27 Apr 2018 10:59:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10BD929329 for ; Fri, 27 Apr 2018 10:59:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0587B2936C; Fri, 27 Apr 2018 10:59:58 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94FE929329 for ; Fri, 27 Apr 2018 10:59:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932733AbeD0K74 (ORCPT ); Fri, 27 Apr 2018 06:59:56 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:33512 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932642AbeD0K74 (ORCPT ); Fri, 27 Apr 2018 06:59:56 -0400 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=+ZKzgH5SYFwmZ8wyaNfJzdiCgbf8uU7gJGtm6iGzUYg=; b=HbyoqWGcYjFl +GKgBJHLyuOREQngzws7agtVUAHSMBvpUJfAckeiMSDg6kfxgJDqIT0cUVhcybBilK4Cz3hWK2eCz vsrAUpNz9dm6KjrX9MhTY9Fxpzqp5BJXRf2ZR1kZe7ZiZe1ESYgCqGGR/PyBYtI8sBie0dIwPzv99 MKEE0=; 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 1fC16U-0007gq-Ah; Fri, 27 Apr 2018 10:59:50 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1fC16T-000423-Nh; Fri, 27 Apr 2018 11:59:49 +0100 From: Mark Brown To: Peter Ujfalusi Cc: Jarkko Nikula , Mark Brown , Mark Brown , Liam Girdwood , jarkko.nikula@bitmer.com, tony@atomide.com, alsa-devel@alsa-project.org, linux-omap@vger.kernel.org, aaro.koskinen@iki.fi, alsa-devel@alsa-project.org Subject: Applied "ASoC: omap: n810: Correct the card level dapm_route" to the asoc tree In-Reply-To: <20180426115115.13744-4-peter.ujfalusi@ti.com> Message-Id: Date: Fri, 27 Apr 2018 11:59:49 +0100 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The patch ASoC: omap: n810: Correct the card level dapm_route has been applied to the asoc tree at https://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 9395b0042c4675c7f6d67c6c8c2f96e8e02e2a41 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Fri, 27 Apr 2018 11:17:12 +0300 Subject: [PATCH] ASoC: omap: n810: Correct the card level dapm_route Fix the capture DAPM route due to core changes regarding to mic bias. Signed-off-by: Peter Ujfalusi Acked-by: Jarkko Nikula Signed-off-by: Mark Brown --- sound/soc/omap/n810.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index 71e5f31fa306..e44bb5baac41 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c @@ -231,8 +231,8 @@ static const struct snd_soc_dapm_route audio_map[] = { {"Ext Spk", NULL, "LLOUT"}, {"Ext Spk", NULL, "RLOUT"}, - {"DMic Rate 64", NULL, "Mic Bias"}, - {"Mic Bias", NULL, "DMic"}, + {"DMic Rate 64", NULL, "DMic"}, + {"DMic", NULL, "Mic Bias"}, }; static const char *spk_function[] = {"Off", "On"};