From patchwork Wed Aug 8 09:05:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 10559657 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A198714E5 for ; Wed, 8 Aug 2018 09:05:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F52D2A960 for ; Wed, 8 Aug 2018 09:05:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 832B82A99E; Wed, 8 Aug 2018 09:05:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C27932A960 for ; Wed, 8 Aug 2018 09:05:53 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 844F52678CC; Wed, 8 Aug 2018 11:05:52 +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 25A1B2678D3; Wed, 8 Aug 2018 11:05:50 +0200 (CEST) Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by alsa0.perex.cz (Postfix) with ESMTP id 4B4D12678CA for ; Wed, 8 Aug 2018 11:05:47 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9A3EF402333A; Wed, 8 Aug 2018 09:05:46 +0000 (UTC) Received: from shalem.localdomain.com (ovpn-117-222.ams2.redhat.com [10.36.117.222]) by smtp.corp.redhat.com (Postfix) with ESMTP id E15D31C718; Wed, 8 Aug 2018 09:05:45 +0000 (UTC) From: Hans de Goede To: alsa-devel@alsa-project.org Date: Wed, 8 Aug 2018 11:05:32 +0200 Message-Id: <20180808090543.15181-2-hdegoede@redhat.com> In-Reply-To: <20180808090543.15181-1-hdegoede@redhat.com> References: <20180808090543.15181-1-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 08 Aug 2018 09:05:46 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 08 Aug 2018 09:05:46 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'hdegoede@redhat.com' RCPT:'' Cc: Takashi Iwai , Hans de Goede , Pierre-Louis Bossart Subject: [alsa-devel] [PATCH v2 02/13] conf/ucm: bytcr-rt5651: Do not use both DAC1 and HPVOL inputs for HP 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 The headphones can either be driven directly from DAC1, or through the HP volume mixer chain to allow volume control, both can be enabled at the same time, but this should not be done. Mix only DAC1 to the headphones and not the HP volume path, there are 2 reasons to choice the DAC1 path; 1) It is the power-on-reset default 2) We don't expose the volume control to e.g. pulseaudio anyways so it is not useful While at it also move the "HPO MIX DAC1" and "HPO MIX HPVOL" entries up a bit so that they are no longer inbetween the "HPO L Playback Switch" and "HPO R Playback Switch" entries. Reviewed-by: Pierre-Louis Bossart Signed-off-by: Hans de Goede --- src/conf/ucm/bytcr-rt5651/HiFi.conf | 2 -- src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/conf/ucm/bytcr-rt5651/HiFi.conf b/src/conf/ucm/bytcr-rt5651/HiFi.conf index 8ded2d52..bc604276 100644 --- a/src/conf/ucm/bytcr-rt5651/HiFi.conf +++ b/src/conf/ucm/bytcr-rt5651/HiFi.conf @@ -30,7 +30,6 @@ SectionDevice."Headphones" { cset "name='Headphone Switch' on" cset "name='HPO L Playback Switch' on" cset "name='HPO R Playback Switch' on" - cset "name='HP Playback Volume' 100" ] DisableSequence [ @@ -39,7 +38,6 @@ SectionDevice."Headphones" { cset "name='Headphone Switch' off" cset "name='HPO L Playback Switch' off" cset "name='HPO R Playback Switch' off" - cset "name='HP Playback Volume' 0" ] Value { diff --git a/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf b/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf index 069427b7..3bf7f69a 100644 --- a/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf +++ b/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf @@ -99,10 +99,10 @@ SectionDefaults [ # default state cset "name='ADC Capture Volume' 126" + cset "name='HPO MIX DAC1 Switch' on" + cset "name='HPO MIX HPVOL Switch' off" cset "name='HP Playback Volume' 0" cset "name='HPO L Playback Switch' off" - cset "name='HPO MIX DAC1 Switch' on" - cset "name='HPO MIX HPVOL Switch' on" cset "name='HPO R Playback Switch' off" cset "name='HPOVOL L Switch' on" cset "name='HPOVOL R Switch' on"