From patchwork Mon Jan 8 16:22:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 123742 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2928559qgn; Mon, 8 Jan 2018 08:24:57 -0800 (PST) X-Google-Smtp-Source: ACJfBovSXGFrkYzROtnoirKTQncGcnx7CNl+objnIVnkJHpJ7EEEo8peSEqf+/JG+NXqcYNRs391 X-Received: by 10.223.143.9 with SMTP id p9mr3853843wrb.261.1515428696940; Mon, 08 Jan 2018 08:24:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515428696; cv=none; d=google.com; s=arc-20160816; b=DjR3kQixFonPvRTj4Mufz3hwGMfKJF4kiZrFtM/hbaGzjJ/mqkFM1JMYjobVVzesa8 +XMK8K/Zhd8dh8HDEdrtALajIWqVI5Q/vnd+YG8vEtk1CcxdYIzv+ZCKIXpSMI7wnkN5 EGYZzGs0gBL1MaPYSh/8YCO2hNR5dU+EptjwUbkUiP+gsm99gvqUTZ4NQl/wkqwJcTt9 RwrnzXP37xx8et2JZ9RykgtPjgUWB80ewrpqW1dPIB4PtOfxmyHK1WUSR6IrM2LgjwIZ hEDIYQusBg26iYYAFjcJKFhu+qPxfvjhw4CeM5p0eHEWDTzRHCIWZtZYd03UHfoGIioh kUrg== 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=AHdmw1YG63w5e5mq7uQTCTl20+/VQ8D951DiL8lEnno=; b=aaDDcakdJ9b2l9/Vva/A/OK8RoZucP/yUGQywDwVMWMAHfIic6Adda2sRDlpNCGfz3 KmgmpISE/rEe9lESIUCFIxW7+hOC5BFBLEu2q2LzeLZfVH0FkOa8RDKFcn1G6URNuwME TTLkztmFhqgCkZo83BqzHVHhIPLgbLjPgOpLMex4iAGEa7ONYxHi2aQarHCSjQtg0XUo t03E1Z2uBKwNGJLYdVze8HxfXjT/D5orYszbxRCLElJCjBhE0mNd1GuO4YiTr+ZlFG0h 1sNNmPXxRsri7XYZY/SrIDECLMPKN+/NL8kyLFJZNuzvhaAtn9Np3xEYHLpGR0zZ7OKt pS5A== 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=a08OFiSc; 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 30si9176243wrx.550.2018.01.08.08.24.56; Mon, 08 Jan 2018 08:24:56 -0800 (PST) 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=a08OFiSc; 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 0D37E26762F; Mon, 8 Jan 2018 17:24:18 +0100 (CET) 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 8AD3A267623; Mon, 8 Jan 2018 17:24:15 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, SPF_PASS, T_RP_MATCHES_RCVD 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 D486A26754E for ; Mon, 8 Jan 2018 17:23:21 +0100 (CET) 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=06kKEWR4+iulK+kb8aLs5KU2eebhved7EBJUL6v0ZRk=; b=a08OFiSctgQU i5M2MBMxKlzJpksKVynPzM6udztNoBtqd7khP7eY5/NzTqTaW0HJFGHU9OItqvdKdS/XdiFPf/mU7 dGl/AiE5R+X7ykG9V+338IVevUsaIXn8M/tt+Ak+Y+EfJEJMrxg9yjBHEaXZ/KT6lBVioLDzlWO+1 Y1O2I=; 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 1eYaCQ-00024G-Ev; Mon, 08 Jan 2018 16:22:58 +0000 Received: from broonie by debutante with local (Exim 4.90) (envelope-from ) id 1eYaCP-0002BW-Vn; Mon, 08 Jan 2018 16:22:58 +0000 From: Mark Brown To: Pierre-Louis Bossart In-Reply-To: <20180105192023.11229-7-pierre-louis.bossart@linux.intel.com> Message-Id: Date: Mon, 08 Jan 2018 16:22:57 +0000 Cc: alsa-devel@alsa-project.org, tiwai@suse.de, Keyon Jie , liam.r.girdwood@linux.intel.com, vinod.koul@intel.com, broonie@kernel.org, Carlo Caione , bardliao@realtek.com Subject: [alsa-devel] Applied "ASoC: Intel: bytcr-rt5651: add support for Line In" 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: bytcr-rt5651: add support for Line In 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 ea39bdcf22b084c6e6db0078f3140f0655a1e572 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Fri, 5 Jan 2018 13:20:23 -0600 Subject: [PATCH] ASoC: Intel: bytcr-rt5651: add support for Line In Add the DAPM widgets and routes. Tested with MinnowMax Turbot + rt5651 eval board with Speaker (LineOut) -> LineIn loopback Thanks to Bard Liao @ Realtek for providing the 0dB settings "IN Capture Volume" = 23 "ADC Capture Volume" = 47 "OUT Playback Volume" = 31 "DAC1 Playback Volume" = 175 Signed-off-by: Pierre-Louis Bossart Acked-By: Vinod Koul Signed-off-by: Mark Brown --- sound/soc/intel/boards/bytcr_rt5651.c | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.15.1 _______________________________________________ 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/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index dfe6435f8ed0..22c9cc5d135e 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -131,6 +131,7 @@ static const struct snd_soc_dapm_widget byt_rt5651_widgets[] = { SND_SOC_DAPM_MIC("Headset Mic", NULL), SND_SOC_DAPM_MIC("Internal Mic", NULL), SND_SOC_DAPM_SPK("Speaker", NULL), + SND_SOC_DAPM_LINE("Line In", NULL), SND_SOC_DAPM_SUPPLY("Platform Clock", SND_SOC_NOPM, 0, 0, platform_clock_control, SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), @@ -142,6 +143,7 @@ static const struct snd_soc_dapm_route byt_rt5651_audio_map[] = { {"Headset Mic", NULL, "Platform Clock"}, {"Internal Mic", NULL, "Platform Clock"}, {"Speaker", NULL, "Platform Clock"}, + {"Line In", NULL, "Platform Clock"}, {"AIF1 Playback", NULL, "ssp2 Tx"}, {"ssp2 Tx", NULL, "codec_out0"}, @@ -155,6 +157,9 @@ static const struct snd_soc_dapm_route byt_rt5651_audio_map[] = { {"Headphone", NULL, "HPOR"}, {"Speaker", NULL, "LOUTL"}, {"Speaker", NULL, "LOUTR"}, + {"IN2P", NULL, "Line In"}, + {"IN2N", NULL, "Line In"}, + }; static const struct snd_soc_dapm_route byt_rt5651_intmic_dmic_map[] = { @@ -193,6 +198,7 @@ static const struct snd_kcontrol_new byt_rt5651_controls[] = { SOC_DAPM_PIN_SWITCH("Headset Mic"), SOC_DAPM_PIN_SWITCH("Internal Mic"), SOC_DAPM_PIN_SWITCH("Speaker"), + SOC_DAPM_PIN_SWITCH("Line In"), }; static struct snd_soc_jack_pin bytcr_jack_pins[] = {