From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 92C3BC433EF for ; Wed, 29 Sep 2021 09:14:11 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B7C5960F58 for ; Wed, 29 Sep 2021 09:14:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B7C5960F58 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 0C326165D; Wed, 29 Sep 2021 11:13:19 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0C326165D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1632906849; bh=VNKz0tQ2phARM5JEN+h+0MDFE3H3qXiFXSSdw/QW2qM=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=Us7DDpor8rI+LFAWOmFA4VGYvtB4JobYKXFQDlIdxsbLIr7lKHe7yEuFeh9OQmgax kMqs0pVLDQhl1pIR0sgKGxTZbEQJLmvrceEgnva7lcD49ffKxW2Kb39RqXA5kF7Y8J rPJ7Yj8UhGIzOMOHG7MBM7DhaXFmPvVv22EeRTt4= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 1B999F804F2; Wed, 29 Sep 2021 11:12:08 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 8843EF804E6; Wed, 29 Sep 2021 11:12:03 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 39690F801F7 for ; Wed, 29 Sep 2021 11:11:54 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 39690F801F7 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Eka8Y0nO" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632906713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=C09BpuNzXzK4t0hQBUTNwlYuq6KValcz1xM5zBbzosI=; b=Eka8Y0nOdOTuvaqrdBoi27q0MIMh4eH5Qmhk3uU38A1NrZR6WpIoyQbCvd+eWPnaNN+uVZ 7dRwUUOvT85vIrInGHnlyvbJJAWmwIeCwsEBPBLpPn75/qoM2N1KIzduGgk2BgEhTHZ7bg XBBwn26DgEVmKVS9IMsKYD+GXTW+7Ts= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-321-LJPZr_XqP0yWfavq8h33Ug-1; Wed, 29 Sep 2021 05:11:51 -0400 X-MC-Unique: LJPZr_XqP0yWfavq8h33Ug-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 93884101AFAC; Wed, 29 Sep 2021 09:11:50 +0000 (UTC) Received: from x1.localdomain (unknown [10.39.194.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A679100164A; Wed, 29 Sep 2021 09:11:49 +0000 (UTC) From: Hans de Goede To: Jaroslav Kysela Subject: [PATCH alsa-ucm-conf 2/5] codecs/rt5640: Rename DAPM PIN switches to avoid having 2 Speaker and Headphones switches Date: Wed, 29 Sep 2021 11:11:41 +0200 Message-Id: <20210929091144.4778-3-hdegoede@redhat.com> In-Reply-To: <20210929091144.4778-1-hdegoede@redhat.com> References: <20210929091144.4778-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=hdegoede@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Cc: Hans de Goede , alsa-devel@alsa-project.org, Pierre-Louis Bossart , Bard Liao X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" Now that we rename the mutes from their weird 'Channel Switch' postfix to the standard 'Playback Switch' postfix we end up having 2 Switches for the 'Speaker' resp. 'Headphones' volume controls, with 1 of the two getting ignored by the alsa-lib mixer code because it is duplicate. This is caused by the bytcr-rt5640 machine driver adding DAPM PIN Switches which are named 'Headphone Switch' resp. 'Speaker Switch', rename these to 'Headphone Output Switch' / 'Speaker Output Switch' so that they get seen as separate controls by the alsa-lib mixer code. Signed-off-by: Hans de Goede --- ucm2/codecs/rt5640/init.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ucm2/codecs/rt5640/init.conf b/ucm2/codecs/rt5640/init.conf index 38baee4..0756b4a 100644 --- a/ucm2/codecs/rt5640/init.conf +++ b/ucm2/codecs/rt5640/init.conf @@ -5,8 +5,13 @@ LibraryConfig.remap.Config { "name='IN1 Boost'" "name='IN1 Boost Capture Volume'" "name='IN2 Boost'" "name='IN2 Boost Capture Volume'" "name='IN3 Boost'" "name='IN3 Boost Capture Volume'" + # Rename the 'Headphone Switch' DAPM PIN switch to avoid it getting + # grouped with 'Headphone Playback Volume' + "name='Headphone Switch'" "name='Headphone Output Switch'" "name='HP Playback Volume'" "name='Headphone Playback Volume'" "name='HP Channel Switch'" "name='Headphone Playback Switch'" + # Idem for the 'Speaker Switch' + "name='Speaker Switch'" "name='Speaker Output Switch'" "name='Speaker Channel Switch'" "name='Speaker Playback Switch'" } -- 2.31.1