From patchwork Wed Nov 14 00:37:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 151016 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5073482ljp; Tue, 13 Nov 2018 16:38:18 -0800 (PST) X-Google-Smtp-Source: AJdET5e1QHhoK111qW86YQXcyPEW0gDWbjq21yKwVBxwPbGUSfdro1ARW4514LGhAG9VLDQqxEgW X-Received: by 2002:a05:6000:1048:: with SMTP id c8mr7025078wrx.171.1542155898358; Tue, 13 Nov 2018 16:38:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542155898; cv=none; d=google.com; s=arc-20160816; b=0weQEnqGfV3k7r44oli3gutbm/4IZYHltzHMHr1Ke9SwahuCXYeTS7UflJ6W+sOdNu A6UZ3PjMvdUW4A166nHpgkizdW6XgrvVRDwYLbbnGJYO6U9QJXo6jvdthDIQ+VNdY5MO nv+0Co/+8600auR5YHRhFmino/D2vdXg7dMpu0r2rOx0sZ5EHK/VQxcndWHIYhdSj9cp duvfLYIoWHE4SJV8X17pTwIXmKTZd37pzfiOaJvYZ/pLL1Z9BHYOUi/hIOF6GCN9oTGx 2Bz1oM5lCucusimjyWbgwrps4/4Zk/yXKgwWognKzs3ViKq8VS2WAtr4v7RZIiReJuVK Wdfg== 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=/f8oM7sSF7h4J+kWNEM9ZEffFNg8ReTfHObydqTFiUk=; b=XwX0yF6vYx/pv+2m6SCgVuwHLEIg2XH3ujln933rLd+191j/facmjM8JFGK5SDAykL jO2K2g++gSZZ8AoiKzDIiZ6B/BAcfnqPg6VmRfpcZ6jfOBgDoEivb02XZ63yBdclvI2o V9eT/q/j/MaEilMtk3Auo6ruh0E6Jfr8jZD/J2rj+8qPp/6jHWLnz/Wq9TVQzy4Xtp01 FQom5eTIPW222rT400ksGXXsYf7XpLl+zwtyke1LqIITfqZwHxJP2L1fJcCHwtX07QmO 1s9ywXmThqOSxNGkOlc9qFofgUtiNw6TJnpQ7RcRbWtfkyEhnOeooMwYnCeqLhUIw8bT P6Fw== 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=ThKmgf9L; 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 v5-v6si16805303wra.457.2018.11.13.16.38.18; Tue, 13 Nov 2018 16:38:18 -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=ThKmgf9L; 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 38907267B00; Wed, 14 Nov 2018 01:38:16 +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 624C1267AFF; Wed, 14 Nov 2018 01:38:13 +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.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,PRX_BODY_72,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 CF90F267AEE for ; Wed, 14 Nov 2018 01:38:11 +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=kWCxm0+k4h1N1/JMhSnov0mSJ2WicZZds+vRQQXVdjo=; b=ThKmgf9L0tNl /SnYYvyLcL+GIMkAxkUXZUOS7Y8M3B77r2mqR+oQPytuAr9lMmgROsGo1UR1eY/iL4RJ8nhq92rLj tEKd8r2u841a4Kh9R4/W6ZI+Xbjj+AgplDgYNjEoEc7xMvAVzqYpZeJALZ4Aq28yLV30yNXDosTij YwN9s=; Received: from [64.114.255.97] (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 1gMjC6-0002p1-Aa; Wed, 14 Nov 2018 00:38:11 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id EAAEF440079; Wed, 14 Nov 2018 00:37:59 +0000 (GMT) From: Mark Brown To: Kirill Marinushkin In-Reply-To: Message-Id: <20181114003759.EAAEF440079@finisterre.ee.mobilebroadband> Date: Wed, 14 Nov 2018 00:37:59 +0000 (GMT) Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: pcm3060: Rename output widgets" 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: pcm3060: Rename output widgets 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 933a95496e48bde40e366a79e6dd9f9740905573 Mon Sep 17 00:00:00 2001 From: Kirill Marinushkin Date: Mon, 12 Nov 2018 08:08:34 +0100 Subject: [PATCH] ASoC: pcm3060: Rename output widgets In the initial commit [1], I added differential output of the codec as separate `+` and `-` widgets: OUTL+ OUTR+ OUTL- OUTR- Later, in the commit [2], I added a device tree property to configure the output as single-ended or differential. Having this property, the `+` and `-` separation in widgets seems for me confusing. There are no functional benefits in such separation, so I find reasonable to get rid of it: OUTL OUTR The new naming is more friendly for sound cards, and is better aligned with other codec drivers in kernel. Renaming the output widgets now should not be a problem from the backwards- compatibility perspective, as the driver for PCM3060 is added into the mainline very recently, and did not yet appear in any releases. [1] commit 6ee47d4a8dac ("ASoC: pcm3060: Add codec driver") [2] commit a78c62de00d5 ("ASoC: pcm3060: Add DT property for single-ended output") Signed-off-by: Kirill Marinushkin Signed-off-by: Mark Brown --- sound/soc/codecs/pcm3060.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) -- 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/codecs/pcm3060.c b/sound/soc/codecs/pcm3060.c index 494d9d662be8..771b46e1974b 100644 --- a/sound/soc/codecs/pcm3060.c +++ b/sound/soc/codecs/pcm3060.c @@ -198,20 +198,16 @@ static const struct snd_kcontrol_new pcm3060_dapm_controls[] = { }; static const struct snd_soc_dapm_widget pcm3060_dapm_widgets[] = { - SND_SOC_DAPM_OUTPUT("OUTL+"), - SND_SOC_DAPM_OUTPUT("OUTR+"), - SND_SOC_DAPM_OUTPUT("OUTL-"), - SND_SOC_DAPM_OUTPUT("OUTR-"), + SND_SOC_DAPM_OUTPUT("OUTL"), + SND_SOC_DAPM_OUTPUT("OUTR"), SND_SOC_DAPM_INPUT("INL"), SND_SOC_DAPM_INPUT("INR"), }; static const struct snd_soc_dapm_route pcm3060_dapm_map[] = { - { "OUTL+", NULL, "Playback" }, - { "OUTR+", NULL, "Playback" }, - { "OUTL-", NULL, "Playback" }, - { "OUTR-", NULL, "Playback" }, + { "OUTL", NULL, "Playback" }, + { "OUTR", NULL, "Playback" }, { "Capture", NULL, "INL" }, { "Capture", NULL, "INR" },