From patchwork Thu May 12 12:55:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Keeping X-Patchwork-Id: 9083171 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4D24BBF29F for ; Thu, 12 May 2016 15:33:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 741302024D for ; Thu, 12 May 2016 15:33:12 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id EBEBA20253 for ; Thu, 12 May 2016 15:33:10 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 2409F2669C8; Thu, 12 May 2016 17:33:10 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 7D7192651E3; Thu, 12 May 2016 17:11:02 +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 DAFBC2651E3; Thu, 12 May 2016 17:11:00 +0200 (CEST) Received: from metanate.com (dougal.metanate.com [90.155.101.14]) by alsa0.perex.cz (Postfix) with ESMTP id B15C5266EA1 for ; Thu, 12 May 2016 14:56:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=metanate.com; s=stronger; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=Wt/1LjqoWRzlc/ujo6St78ti0d+cSjbY+HGoaZ0hUJo=; b=hlM8cqu7sLAgS7BilvlVnqbiCn6SF9rS6SRtnJKwKcG8jtqp/ed5+w2X/03F/6l5O7b9SxbFDHgLOuSghH/xAaS3uZcgalC3lsfClUi1h2kQDOu429Q6PzSCWAbRS5qbxSAm+bRgbRegrsqyqAmq4ruWPTiwksvVZP+7FDeV6eZ8yPEE+GO8r4MmfDFkDbtmhq+HgIchlcMXl1wiAG4MG5czEonA4u9yliAJjafkvWAXtTZmtOjC2Zn/qOnTtf7LPy0IaDIchgkJI0DLeY1tZkxGRC7SHmJRlUs1KtOAOBjecAGwb7dYFr6fmd4qICeEy4zIuhtVYXcRb87eVJmvLA==; Received: from johnkeeping.plus.com ([81.174.171.191] helo=leela.localdomain) by shrek.metanate.com with esmtpsa (TLSv1.2:AES128-SHA256:128) (Exim 4.83_RC2) (envelope-from ) id 1b0qA6-0001nl-RP; Thu, 12 May 2016 13:56:19 +0100 From: John Keeping To: Mark Brown Date: Thu, 12 May 2016 13:55:53 +0100 Message-Id: <20160512125553.8523-1-john@metanate.com> X-Mailer: git-send-email 2.8.2.565.gdb84f68.dirty In-Reply-To: <20160512111216.GD6261@sirena.org.uk> References: <20160512111216.GD6261@sirena.org.uk> Cc: alsa-devel@alsa-project.org, Liam Girdwood , linux-kernel@vger.kernel.org, Takashi Iwai , John Keeping Subject: [alsa-devel] [PATCH] ASoC: dapm: deprecate MICBIAS widget type 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 X-Virus-Scanned: ClamAV using ClamSMTP Commit 086d7f804e26 ("ASoC: Convert WM8962 MICBIAS to a supply widget", 2011-09-23) says: A supply widget is generally clearer than a MICBIAS widget and a mic bias is just a type of supply so use a supply widget for the MICBIAS. This also avoids confusion with the routing when connected to multiple inputs. but this has never been documented as a policy. Add some comments to make it clear. Signed-off-by: John Keeping --- include/sound/soc-dapm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 97069466c38d..3101d53468aa 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -100,6 +100,7 @@ struct device; { .id = snd_soc_dapm_mixer_named_ctl, .name = wname, \ SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \ .kcontrol_news = wcontrols, .num_kcontrols = wncontrols} +/* DEPRECATED: use SND_SOC_DAPM_SUPPLY */ #define SND_SOC_DAPM_MICBIAS(wname, wreg, wshift, winvert) \ { .id = snd_soc_dapm_micbias, .name = wname, \ SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \ @@ -473,7 +474,7 @@ enum snd_soc_dapm_type { snd_soc_dapm_out_drv, /* output driver */ snd_soc_dapm_adc, /* analog to digital converter */ snd_soc_dapm_dac, /* digital to analog converter */ - snd_soc_dapm_micbias, /* microphone bias (power) */ + snd_soc_dapm_micbias, /* microphone bias (power) - DEPRECATED: use snd_soc_dapm_supply */ snd_soc_dapm_mic, /* microphone */ snd_soc_dapm_hp, /* headphones */ snd_soc_dapm_spk, /* speaker */