From patchwork Sat Sep 24 09:50:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 609145 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 25D3AC32771 for ; Sat, 24 Sep 2022 09:51:31 +0000 (UTC) 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 58394820; Sat, 24 Sep 2022 11:50:39 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 58394820 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1664013089; bh=E6o7WRvRKXT79c1HRJ8artLwgRXZMKkMBJVZFZQpe4c=; h=From:To:Subject:Date:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=eTWOZsMT+jQz9zGVRn2YdugKlRrhJpdsMGQ51EOkcrIUlkv0F+3T9mXCaja6fCMCK xlXdD9IBcgsL3pqbhJ20xSqLASk9jBbe2xr5yUGSoy70JTGFKigK/+rjq8tJOg4T06 QgdhVQ/a6I3FURvyLlrlfor9lJeWcn3C70Kl0Ojg= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id E1AF4F80154; Sat, 24 Sep 2022 11:50:38 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 64CA2F80154; Sat, 24 Sep 2022 11:50:37 +0200 (CEST) Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 77D68F80124 for ; Sat, 24 Sep 2022 11:50:34 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 77D68F80124 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="d6hRO9bx" Received: by mail-pj1-x102e.google.com with SMTP id s90-20020a17090a2f6300b00203a685a1aaso2420326pjd.1 for ; Sat, 24 Sep 2022 02:50:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=cSyB+p+NH9fNrvnp1dRITZWO5DlTrkpIl0IbG2JZ8SE=; b=d6hRO9bxJ1ZjSbV/CM8zCrtOYWTHbkteregaj59xAYYqXQsh9Sumnhx2Eu/owrSCmQ VhvhC2IvEOUA4AxeEffeaULhAUZLSa2EOqKo7HrET4Th1v3nqpoWz+NugarXWBJVXy8p DDUfcfhp3EOUvyjuMuw++7mhiOTty7jfehROCgugYaIvl5E77ZGlgQkYpQzPBijcz14q H5xjezgPtvVJ0mdElm4hE9JWHHBNNRVmL9VC8Q2NmekeeYZOY54K4X+LEf+DgRSk54hm bCzm2RowfBUXsjFZqRE2mRuaQRDiGqdVDLhdkw0tBevmdaQysQJzxsGHD4vlkU7Pk3wK CaPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=cSyB+p+NH9fNrvnp1dRITZWO5DlTrkpIl0IbG2JZ8SE=; b=DB/wImKmAb9bgXjett99gw0tBO4CRr/413Ej8fOmEF16DmekOPnZABbeYteCFp/55k f29CTTpBgLPvgphRWmBRIvlVNVohkgFU2q+heibaFHKTP8MwytTosdMgrHuv9zo2AB6l gGJjQ1pZapZrkJ34Tiyq1DgPeUSLMXhpaBVMge+RuE5icHZVJZ+mGgWoQlCaK6cuBFQK 9Q730xHMiXMLeokH84ARMr8LwDz0j5Gimj1Ow8ZZb+Y33JJGODmbW4aObqqoidF8kTvv L3nfzg3uSmty2UvWhWw56wWajlyqDZzjQz3B0kSrYxLxOJ6mB5x9hAZkGxecD1bLfy+E 8NpQ== X-Gm-Message-State: ACrzQf23KqcdibVSMVupgjErx4KlIlqjMVGQA9Trv15GZmAQj4LfPPDi e5D+TP1wcYOD5n4ViHMfZbw= X-Google-Smtp-Source: AMsMyM5XmEsIHu+v0o9gcoHkJFwQJt+ppfY2jFOO/Jvrjnp0dVY87OczvkyH74GVLtL0QQ/gF9K+rw== X-Received: by 2002:a17:90b:4b88:b0:202:cbab:980b with SMTP id lr8-20020a17090b4b8800b00202cbab980bmr14284036pjb.153.1664013031799; Sat, 24 Sep 2022 02:50:31 -0700 (PDT) Received: from fedora.flets-east.jp ([2400:4050:c360:8200:8ae8:3c4:c0da:7419]) by smtp.gmail.com with ESMTPSA id r11-20020a170902be0b00b00176c0e055f8sm7340223pls.64.2022.09.24.02.50.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Sep 2022 02:50:31 -0700 (PDT) From: Akihiko Odaki To: Subject: [PATCH 1/2] ASoC: amd: acp3x-5682: Remove SND_JACK_LINEOUT Date: Sat, 24 Sep 2022 18:50:24 +0900 Message-Id: <20220924095025.7778-1-akihiko.odaki@gmail.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, =?utf-8?q?N=C3=ADcolas_F_=2E_R_=2E_A_=2E_Pr?= =?utf-8?q?ado?= , linux-kernel@vger.kernel.org, Takashi Iwai , Liam Girdwood , Mark Brown , Akihiko Odaki , Matthias Brugger 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" RT5682 only has a headset jack. Signed-off-by: Akihiko Odaki --- sound/soc/amd/acp3x-rt5682-max9836.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/amd/acp3x-rt5682-max9836.c b/sound/soc/amd/acp3x-rt5682-max9836.c index 0543dda75b99..0bdd9c26dd22 100644 --- a/sound/soc/amd/acp3x-rt5682-max9836.c +++ b/sound/soc/amd/acp3x-rt5682-max9836.c @@ -87,7 +87,7 @@ static int acp3x_5682_init(struct snd_soc_pcm_runtime *rtd) rt5682_dai_bclk = clk_get(component->dev, "rt5682-dai-bclk"); ret = snd_soc_card_jack_new(card, "Headset Jack", - SND_JACK_HEADSET | SND_JACK_LINEOUT | + SND_JACK_HEADSET | SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2 | SND_JACK_BTN_3, &pco_jack); From patchwork Sat Sep 24 09:50:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 608838 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 76A7BC32771 for ; Sat, 24 Sep 2022 09:51:57 +0000 (UTC) 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 7DD3220C; Sat, 24 Sep 2022 11:51:05 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7DD3220C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1664013115; bh=azc1OM0CwWJIwEZmrGMw6Xz3fXUwZeRE7CCQFOuRfDw=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=M2sbTGkb2nb0Lx3RHDNVHLAgXeKeWdUzCzj0QT7u4GPr0I7sid4sVi37pAdyKIGbM xkLKufJPgJ/aMezk88otyFRFlwyV4PiqbfRidVY6mMCRBWNwgvZ6rv6lizX3XUIt2Y TrQBo9Vk23avQMb0CCV3CY+RpuN9yEjg/wqKXKpk= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 8F699F8014E; Sat, 24 Sep 2022 11:50:42 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5D6F3F804E6; Sat, 24 Sep 2022 11:50:39 +0200 (CEST) Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id C6806F8011C for ; Sat, 24 Sep 2022 11:50:36 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C6806F8011C Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ftJ39f4E" Received: by mail-pj1-x102e.google.com with SMTP id q9-20020a17090a178900b0020265d92ae3so8046315pja.5 for ; Sat, 24 Sep 2022 02:50:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=XvnLxeE0AO/sb9+4Q89V2vzbus4Cqug44xbFR5p3YOU=; b=ftJ39f4E1m8gmH8TmgOHpWD8mg832NoK+mK2tkeja4ah6OjfQBSygn3EIuISW/rbmY D8yd1R1FLeD2h4tRAt5Ts+BTzM9usF9kZsJmHxvdwL7jPzZftwRubtoceGwoHKnCYbMU npbhvwEB7oet7j3JsZX7b1YWjiGlGyAmSvHyPjnV6Z5lZ13Pacld1WJ9vPkNrZ9W/wKV CU6iw7blWe1IrvE9FP9HGkYq9uB7XciRNeN7pgl4IE1o4L+iMDobCnX4dLI/ERGyPKZu 39y6VQw72DjXt1aavpBiOYSiDxy8lFysP+aJZvQvOCRYXldAmfy524PPjCGnKpc0wJvb Y1QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=XvnLxeE0AO/sb9+4Q89V2vzbus4Cqug44xbFR5p3YOU=; b=kvPeBH6ilIJGKUTWZpUApKmaQ5ZteHhXqoZFj6ioxYor7yDDbCUi+T+FQ+DGJrwx5a Z3dxWq62GzyM5Ydkn8YhGo4xUyxbs0E06wctP8ZHC3fkI+xCHZYjOv33pz3o7ihRI69j YEAhGY8L6IQi1x9YSP/E90uXYnr9xlEZ/++IJhf1yj3DiT1HQiWU4YLR2KSVtZlCCEgL N2JeDO7JVCeXmmQvj8HrdiN145Itxi65MLQYyRY8PTevDtr3CwTbje8cFrNYkseQsrNC S+ONvQbHw2mbXxySusvZKk2k4BOPqlnctolzkbTd3akTONaZgXxy6im0Wx8YrtypVS56 +drQ== X-Gm-Message-State: ACrzQf2XRphEHZevaLbc4aHHG/1x3K7TfmHX6y6AMRHOdTx/2HUBTeh2 NA8n/s6a8qRvdKV+SoDLPmo= X-Google-Smtp-Source: AMsMyM5nelo22CdgC7JmIDrjRFDB7bs738j3UegAaYnT3tFCz3RV59HX5wD7fY6qYXB0K58BqzGqTw== X-Received: by 2002:a17:90b:1650:b0:205:65db:d6eb with SMTP id il16-20020a17090b165000b0020565dbd6ebmr13320796pjb.246.1664013034691; Sat, 24 Sep 2022 02:50:34 -0700 (PDT) Received: from fedora.flets-east.jp ([2400:4050:c360:8200:8ae8:3c4:c0da:7419]) by smtp.gmail.com with ESMTPSA id r11-20020a170902be0b00b00176c0e055f8sm7340223pls.64.2022.09.24.02.50.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Sep 2022 02:50:34 -0700 (PDT) From: Akihiko Odaki To: Subject: [PATCH 2/2] ASoC: amd: acp3x-5682: Expose individual headset jack pins Date: Sat, 24 Sep 2022 18:50:25 +0900 Message-Id: <20220924095025.7778-2-akihiko.odaki@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220924095025.7778-1-akihiko.odaki@gmail.com> References: <20220924095025.7778-1-akihiko.odaki@gmail.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, =?utf-8?q?N=C3=ADcolas_F_=2E_R_=2E_A_=2E_Pr?= =?utf-8?q?ado?= , linux-kernel@vger.kernel.org, Takashi Iwai , Liam Girdwood , Mark Brown , Akihiko Odaki , Matthias Brugger 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" The rt5682 codec is able to distinguish between two event types: headphone insertion/removal and headset microphone insertion/removal. However, currently, the acp3x-5682 driver exposes a single kcontrol for the headset jack, so userspace isn't able to differentiate between the two events. Add a definition for the headset jack pins, so that a separate jack kcontrol is created for each one, allowing userspace to track and handle them individually. This change is based on commit 194ff8db0378 ("ASoC: mediatek: mt8192-mt6359: Expose individual headset jack pins"). Signed-off-by: Akihiko Odaki --- sound/soc/amd/acp3x-rt5682-max9836.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/sound/soc/amd/acp3x-rt5682-max9836.c b/sound/soc/amd/acp3x-rt5682-max9836.c index 0bdd9c26dd22..3679931a2285 100644 --- a/sound/soc/amd/acp3x-rt5682-max9836.c +++ b/sound/soc/amd/acp3x-rt5682-max9836.c @@ -39,6 +39,17 @@ enum { EC, }; +static struct snd_soc_jack_pin acp3x_5682_jack_pins[] = { + { + .pin = "Headphone Jack", + .mask = SND_JACK_HEADPHONE, + }, + { + .pin = "Headset Mic", + .mask = SND_JACK_MICROPHONE, + }, +}; + static int acp3x_5682_init(struct snd_soc_pcm_runtime *rtd) { int ret; @@ -86,11 +97,12 @@ static int acp3x_5682_init(struct snd_soc_pcm_runtime *rtd) rt5682_dai_wclk = clk_get(component->dev, "rt5682-dai-wclk"); rt5682_dai_bclk = clk_get(component->dev, "rt5682-dai-bclk"); - ret = snd_soc_card_jack_new(card, "Headset Jack", + ret = snd_soc_card_jack_new_pins(card, "Headset Jack", SND_JACK_HEADSET | SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2 | SND_JACK_BTN_3, - &pco_jack); + &pco_jack, acp3x_5682_jack_pins, + ARRAY_SIZE(acp3x_5682_jack_pins)); if (ret) { dev_err(card->dev, "HP jack creation failed %d\n", ret); return ret;