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: 151015 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5073429ljp; Tue, 13 Nov 2018 16:38:13 -0800 (PST) X-Google-Smtp-Source: AJdET5fO0epjUEBWJCYkaNKpTJA/mk5OKiQqWhSQ7l7CI+EEqX5kpRO5yRbGz9E8/95AmFRyhE+j X-Received: by 2002:adf:ea82:: with SMTP id s2-v6mr6585869wrm.180.1542155893167; Tue, 13 Nov 2018 16:38:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542155893; cv=none; d=google.com; s=arc-20160816; b=LJnYmy7CCfKBtuA3wt4PXJBWGNPYkwsnHZvcRCyp9flRYhRtpIKyoK/b9PiIjODQGO vd2CQWhVKgOJuA16IISoqc0xEStZC3G26GW7Vg5jDSFrsF3M8BxcYpkQKqlaFn6qVqkA VMIopjfUr3/VhcsHkC4G02WnKOjSUSTt99WJm8BiNmOo6mNWs9izMtfXW+QknBaTKzg6 Mg7Ze58NU/FFAMKemhvyVGzXkgzH1ng2H8u13ObviRHvYv7qlX2guyMj1dzb+du8Vtyz pnwlrNKoFlj6X8ZEaGkVZCds2HmzcvFlOteA5osTzgaZLeu/ieK0in2fbdilegABf+gW R8Bg== 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=lRjm8PBncHbHIlIfy4w3SUNOZwUzkflFdak+z1UAQ/s=; b=ScQ2qrTeC3CKRNm7bn6BfH9t+LTgnTH1OOuekvJLp4wHshxxim6Ie5yw+2B01nFkFD lUJ1S5FioO100eNVsisaj7+gSIH3PNeBURtXEU+9wCoXTIgBknZ0I0XkyARpzu5XNTEB pLATas7uqE1ZMjuThdiY4W9FFhDrldVHT1qTZ4crFT8KCJQj+5yUIIbfmiN9s/8FQElU ZSuaabvynjXm1TLF8zTETfImG2hqpOQRrbR5h1CgFDdU4e+lkW2Fr9BZVeWXVDyVenjK 9HUr26dtSolOcF54E//rYHelaQCnkyU5Wtt1fflP6q++CzFqS2smnpy75tv21l0hlXWx hG1g== 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=Rq0m4Pw3; 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 2-v6si16261280wra.88.2018.11.13.16.38.12; Tue, 13 Nov 2018 16:38:13 -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=Rq0m4Pw3; 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 D50E4267AB9; Wed, 14 Nov 2018 01:38:11 +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 76103267AF0; Wed, 14 Nov 2018 01:38:09 +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 BA347267A61 for ; Wed, 14 Nov 2018 01:38:07 +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=TtC+G8hkYNgYqe8er/v+doJEHFpUXAdzOT2FUgdoH1M=; b=Rq0m4Pw33fiv HJ1nsXurQseyYU3T9ThIwpCk8fLAdhFPfHgQSmH7d0BzWe/M6Hf93XMPvdso2TJDnY7tA4V5OEs+T Pfp9LPV2eDCErh0Bfn/O4ahnWp+sIIiMrphkHHGT+uvAjAG4I7HovYPDoSrO8xfkEJfDgO+QhULHI u3YCo=; 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 1gMjC3-0002p0-8P; Wed, 14 Nov 2018 00:38:07 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 7AC2C440078; Wed, 14 Nov 2018 00:37:59 +0000 (GMT) From: Mark Brown To: Kirill Marinushkin In-Reply-To: Message-Id: <20181114003759.7AC2C440078@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 efcf8f9ee39dd4d63fc95d05e460a78605a6cbf2 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" },