From patchwork Fri Nov 23 14:14:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 151875 Delivered-To: patch@linaro.org Received: by 2002:aa7:da0f:0:0:0:0:0 with SMTP id r15csp2203586eds; Fri, 23 Nov 2018 06:14:20 -0800 (PST) X-Google-Smtp-Source: AFSGD/UnBgrtbChtMK8TCf3BaEk21PYD2wd+I1BGAg4tl0nyVgdWAbvYL8MXDNGlR4aj/SXShmYj X-Received: by 2002:a5d:56d2:: with SMTP id m18mr15171508wrw.113.1542982460824; Fri, 23 Nov 2018 06:14:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542982460; cv=none; d=google.com; s=arc-20160816; b=vpvC5RV+b/MOOVm0K5PauGO8iC4h+RL6Sbv94/nhch3ogixZFL6+xvTduLua5XpffB ruUy6kUDUhBGULY5jw6vQzcpAt3jL49QZP1vCnxq0n1IB2R7Diu5QjMEhw9mLl0M8fIm 7w/+XvJxQ1kvCAvsJufp3tOfMqGqDNzaYwOOs/HbzPsvTH06rIMurVuEMlBuyquRke8M pviTOr0bryHxSp7jiSl/SZ7GXZwvgJ5u1C5yFmz2SggRRBxm7m9mxw23mYVf6F2r/0cA ttTLpQpXod6WRcn2QG4U2yw5LvF5ewvG8E0PlvF5xOWzn0lmO6YFMj1bY3AinZa7LTOy kTOw== 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; bh=ZQKC3M6QRRJ97AvLnOX0PE53Qt143vbfRg/0v9hV7vY=; b=LIboi4RB5x8BvJ1a/LQI2PuPMPE8ZqR5n9QK8PoLJSSE25mutjUt+yq+gfvl7LJ9Ho DzlGTEWuKuUmdx4DC9drHbWbG7F9D/dhK07v/mNeBrUeIrfgI0NA04lsOq04NG3c63Y/ UK7GqQ0TqfYeukEeZI6qsVTf/cVncfX0Fiimaru3hqZIXBYhbrMgtGOycDD8v4CVzpeH xSClMLBKS254n745Xb59IduVyx5mXIEEc0chPt26ca/Z3DT4BQYpxx2IiDqpFoANqZoo TO+CtZq0RlX9dYd0KQUqbWZMbndrusEC+Icits2GnfnxgvfJPEoBlLgdgdXrTxRTKvPB 7VSg== 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=qIYMxZcD; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id b13si13586375wrw.102.2018.11.23.06.14.20; Fri, 23 Nov 2018 06:14:20 -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=qIYMxZcD; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id BDA5B267ABC; Fri, 23 Nov 2018 15:14:19 +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 03F69267ABC; Fri, 23 Nov 2018 15:14:16 +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=1.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,PRX_BODY_26,RCVD_IN_DNSWL_NONE 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 7A6162678DF for ; Fri, 23 Nov 2018 15:14:15 +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=XxcD0f8MjGfOdOgywa+VXBB1YtIArxqOT6c2hqLPWkg=; b=qIYMxZcDK9LU u7elss8rvjoI2zRpHR8oQ78HLmQxvvuF1ujNQMG01QKcHCwFn5hwFE60m+kzasrTPXZx1yt2Jgkah ngY3AzvesLXG7rzxy+I1mu54cwJP0S4nn1wlnSEGETmwEDYHmrVwLHEbaewmGcV7zmeb8VjKPBve+ Xgobk=; Received: from [176.12.107.140] (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 1gQCDl-00019X-TB; Fri, 23 Nov 2018 14:14:14 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 18976440078; Fri, 23 Nov 2018 14:14:12 +0000 (GMT) From: Mark Brown To: Chen-Yu Tsai In-Reply-To: <20181122102325.29495-3-wens@csie.org> Message-Id: <20181123141412.18976440078@finisterre.ee.mobilebroadband> Date: Fri, 23 Nov 2018 14:14:12 +0000 (GMT) Cc: Mark Rutland , devicetree@vger.kernel.org, alsa-devel@alsa-project.org, Maxime Ripard , Liam Girdwood , Rob Herring , linux-kernel@vger.kernel.org, Vasily Khoruzhick , linux-sunxi@googlegroups.com, Mark Brown , linux-arm-kernel@lists.infradead.org Subject: [alsa-devel] Applied "ASoC: sunxi: sun50i-codec-analog: Add support for cpvdd regulator supply" 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: sunxi: sun50i-codec-analog: Add support for cpvdd regulator supply 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 ca0412a05756cd0b94751ca4d54fe6522f00b1f4 Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Thu, 22 Nov 2018 18:23:19 +0800 Subject: [PATCH] ASoC: sunxi: sun50i-codec-analog: Add support for cpvdd regulator supply On the Allwinner A64 SoCs, the audio codec has a built-in headphone amplifier. This amplifier has a power supply separate from the rest of the analog audio circuitry, labeled cpvdd. This patch adds a DAPM widget for this supply, and ties it to the headphone amp widget. Signed-off-by: Chen-Yu Tsai Acked-by: Maxime Ripard Signed-off-by: Mark Brown --- sound/soc/sunxi/sun50i-codec-analog.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.19.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/sunxi/sun50i-codec-analog.c b/sound/soc/sunxi/sun50i-codec-analog.c index 8f5f999df631..df1fed0aa001 100644 --- a/sound/soc/sunxi/sun50i-codec-analog.c +++ b/sound/soc/sunxi/sun50i-codec-analog.c @@ -274,6 +274,7 @@ static const struct snd_soc_dapm_widget sun50i_a64_codec_widgets[] = { * stream widgets at the card level. */ + SND_SOC_DAPM_REGULATOR_SUPPLY("hpvcc", 0, 0), SND_SOC_DAPM_MUX("Headphone Source Playback Route", SND_SOC_NOPM, 0, 0, sun50i_codec_hp_src), SND_SOC_DAPM_OUT_DRV("Headphone Amp", SUN50I_ADDA_HP_CTRL, @@ -361,6 +362,7 @@ static const struct snd_soc_dapm_route sun50i_a64_codec_routes[] = { { "Headphone Source Playback Route", "Mixer", "Left Mixer" }, { "Headphone Source Playback Route", "Mixer", "Right Mixer" }, { "Headphone Amp", NULL, "Headphone Source Playback Route" }, + { "Headphone Amp", NULL, "hpvcc" }, { "HP", NULL, "Headphone Amp" }, /* Microphone Routes */