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 X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF285C433DB for ; Mon, 28 Dec 2020 14:17:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 87502207B2 for ; Mon, 28 Dec 2020 14:17:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2441464AbgL1ORX (ORCPT ); Mon, 28 Dec 2020 09:17:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2441408AbgL1ORO (ORCPT ); Mon, 28 Dec 2020 09:17:14 -0500 Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 70630C06179A for ; Mon, 28 Dec 2020 06:16:34 -0800 (PST) Received: by mail-pg1-x535.google.com with SMTP id i5so7418626pgo.1 for ; Mon, 28 Dec 2020 06:16:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=tG/RECwRgNQRQ8Y3N/bmt9ivqZMjunU0lDRr6TZ1FSs=; b=BASgsSc6AnQXc6h5OKkLHTc8nKdTjRKgDhLNdBqlxiHrzOKY+xmqtDb6hX1w3ne7aP +GSzpQldp9Ol/Tsf+3hroeJPMnK9Yvk9n2qUWJ6Nk8vUn3mc2v2Al1DLuCAHnHgTeDd9 uOP4Jyul3i3FiDyb3ggNcGbZ8phIPSBBjEoFddI9zJwlMrmCStujI/TsjZ5ZhI5pxC+a 4YFPVDaDV2eC1jaW+sDSERr92tbw9Pgo9SLKTqt73r5rvJuDJgsOaldg/f+7iNutwcG0 qdijuRjw1OfQMIEKKtuWwiTdSmU5ToRX59ewX+mUuz6Y9x2wPqM9nWeafu9tDnF081lV JN7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=tG/RECwRgNQRQ8Y3N/bmt9ivqZMjunU0lDRr6TZ1FSs=; b=qybzUeANBrPztVgPnJTqn6ticK0BHm3gE650mmf3DSaWIE9dnRvigm/DYJloI9YO9R iVYOG1Stff0iprR25100kNsnbuEx3SCBek/ROp+tlkIc6VSRzVKz3Hfz0BdLRY6oNdHH cQC0Z8JyTEAjTXSFZqsgoI5kld7VNipmhnQOXsU61QHEZ3jmgcPbV7HQfLBUkZ6Ov+OU rhxQWj7Cmp5dLAQfZlx0KnhT4ppgretx88L1TgpoH6/nUsrfmOYDaNrHgLd1zTm6S2mc Fl3FHUu0lOYxeHQSVzPaMe8Gtqe8AhMf5JjI0bt4YW1TpJkGss29nj5NGBD/BNh5eGWZ A/dQ== X-Gm-Message-State: AOAM530/nQzdbGrKgKnWQTZOspuStAgJWeq0pm1N0oH0jmPhgiFPRNbL yBg1RMu3DH8JlMkHfHDy2xBllihX0O8NQk0HxVE= X-Google-Smtp-Source: ABdhPJzgfoxIJsP2SMbDpjaL6TOeeco/9fSOdRZRL5HgwYT+kLVXmorkD+7UgHeMCnuoRe3C8xC6Ph7OGm2IH3XMfIw= X-Received: by 2002:a63:b1e:: with SMTP id 30mr43741498pgl.203.1609164994000; Mon, 28 Dec 2020 06:16:34 -0800 (PST) MIME-Version: 1.0 References: <20201227211232.117801-1-hdegoede@redhat.com> <20201227211232.117801-11-hdegoede@redhat.com> In-Reply-To: <20201227211232.117801-11-hdegoede@redhat.com> From: Andy Shevchenko Date: Mon, 28 Dec 2020 16:16:17 +0200 Message-ID: Subject: Re: [PATCH 10/14] extcon: arizona: Also report jack state through snd_soc_jack_report() To: Hans de Goede Cc: Lee Jones , MyungJoo Ham , Chanwoo Choi , Cezary Rojewski , Pierre-Louis Bossart , Liam Girdwood , Jie Yang , Mark Brown , patches@opensource.cirrus.com, Linux Kernel Mailing List , ALSA Development Mailing List Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Dec 27, 2020 at 11:16 PM Hans de Goede wrote: > > The Linux Arizona driver uses the MFD framework to create several > sub-devices for the Arizona codec and then uses a driver per function. > > The extcon-arizona driver handles jack-detect support and exports info > about the jack state to userspace through the standard extcon sysfs > class interface. > > Standard Linux userspace does not monitor/use the extcon sysfs interface > for jack-detection, resulting in the jack-state not being taken into > account by userspace. > > The ASoC machine-driver may have created a standard ASoC jack when > registering the card. In this case also report the jack-state through the > ASoC jack so that jack-detection works with standard Linux userspace. > > Signed-off-by: Hans de Goede > --- > drivers/extcon/extcon-arizona.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c > index d5b3231744f9..931a7d239aea 100644 > --- a/drivers/extcon/extcon-arizona.c > +++ b/drivers/extcon/extcon-arizona.c > @@ -20,6 +20,7 @@ > #include > #include > > +#include > #include > > #include > @@ -598,11 +599,19 @@ static int arizona_hpdet_do_id(struct arizona_extcon_info *info, int *reading, > static void arizona_set_extcon_state(struct arizona_extcon_info *info, > unsigned int id, bool state) > { > - int ret; > + int ret, mask = 0; I would rather prefer... drop assignment here... > ret = extcon_set_state_sync(info->edev, id, state); > if (ret) > dev_err(info->arizona->dev, "Failed to set extcon state: %d\n", ret); > + > + switch (id) { > + case EXTCON_JACK_HEADPHONE: mask = SND_JACK_HEADPHONE; break; > + case EXTCON_JACK_MICROPHONE: mask = SND_JACK_MICROPHONE; break; ...introduce default here, which immediately bails out (return)... > + } > + > + if (info->arizona->jack && mask) ...and drop mask check here. > + snd_soc_jack_report(info->arizona->jack, state ? mask : 0, mask); > } > > static irqreturn_t arizona_hpdet_irq(int irq, void *data) > -- > 2.28.0 > -- With Best Regards, Andy Shevchenko 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 X-Spam-Level: X-Spam-Status: No, score=-10.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C857CC433E0 for ; Mon, 28 Dec 2020 14:17:34 +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 4B99321D94 for ; Mon, 28 Dec 2020 14:17:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4B99321D94 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@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 7BC811711; Mon, 28 Dec 2020 15:16:41 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7BC811711 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1609165051; bh=5LUbBI1gyuNYj0CSrFsMmOUA9YPlSs1eSpFES5/nvGI=; h=References:In-Reply-To:From:Date:Subject:To:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=sg56KWP1YtqzKaVMJQr3RjuZ3StgQjbX3260dk4614Zou+bjseTp53+L2xaoRoRaH Fkw6bejpzCndk7dKdPw9G+6kkWd8mPtjyvQyEwwH6t18wFqfUXJgz56xcygNxGuhsQ X0HMM2lJpqnQEbRH0TmghFMNMeXO2zDrGsQtWmhw= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 1908EF801ED; Mon, 28 Dec 2020 15:16:41 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E7D84F801F5; Mon, 28 Dec 2020 15:16:39 +0100 (CET) Received: from mail-pg1-x529.google.com (mail-pg1-x529.google.com [IPv6:2607:f8b0:4864:20::529]) (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 6DF7EF80143 for ; Mon, 28 Dec 2020 15:16:35 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 6DF7EF80143 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BASgsSc6" Received: by mail-pg1-x529.google.com with SMTP id p18so7381498pgm.11 for ; Mon, 28 Dec 2020 06:16:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=tG/RECwRgNQRQ8Y3N/bmt9ivqZMjunU0lDRr6TZ1FSs=; b=BASgsSc6AnQXc6h5OKkLHTc8nKdTjRKgDhLNdBqlxiHrzOKY+xmqtDb6hX1w3ne7aP +GSzpQldp9Ol/Tsf+3hroeJPMnK9Yvk9n2qUWJ6Nk8vUn3mc2v2Al1DLuCAHnHgTeDd9 uOP4Jyul3i3FiDyb3ggNcGbZ8phIPSBBjEoFddI9zJwlMrmCStujI/TsjZ5ZhI5pxC+a 4YFPVDaDV2eC1jaW+sDSERr92tbw9Pgo9SLKTqt73r5rvJuDJgsOaldg/f+7iNutwcG0 qdijuRjw1OfQMIEKKtuWwiTdSmU5ToRX59ewX+mUuz6Y9x2wPqM9nWeafu9tDnF081lV JN7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=tG/RECwRgNQRQ8Y3N/bmt9ivqZMjunU0lDRr6TZ1FSs=; b=JE1ACIDc1LkPv2cuDNWtQVhPkzQW89/K1iVR7xBjfaasnXpULVYLdHzPcNg+NR9S27 Ix0/maRb/ga91DgiQELtOj9FXl9jOryrXXXob44LlOEO6pvS/quUV07zpt/ZAZqVn9Hi tOOSpXXiJ+Ul32jTojjRCY+mCISJFXN7mjs8ZJV2Oy1h/xZ7BoxVuKpp5SyQf3dkVPzG RHWMTcszbAMgZTFfeInbhOZgv1IoGhmIe5wPvmNrPlMvsJYF7GpDQBHH5F8zX9qenLDo SB81Rs/JfQVMy9cbqF0lQqWQC5TRjTYI+4SJ798apgkJG1w7hhd4LOJvxQkuDxV+a8r9 e8SA== X-Gm-Message-State: AOAM531LRc65+CxfgDQxATtZs7Vg3ak4bgW6XoUb/eqJmsq4CWcojHQf ck3O9wvzF7XoOLfHi6Mb/gectWyRY7ojkw0eJAc= X-Google-Smtp-Source: ABdhPJzgfoxIJsP2SMbDpjaL6TOeeco/9fSOdRZRL5HgwYT+kLVXmorkD+7UgHeMCnuoRe3C8xC6Ph7OGm2IH3XMfIw= X-Received: by 2002:a63:b1e:: with SMTP id 30mr43741498pgl.203.1609164994000; Mon, 28 Dec 2020 06:16:34 -0800 (PST) MIME-Version: 1.0 References: <20201227211232.117801-1-hdegoede@redhat.com> <20201227211232.117801-11-hdegoede@redhat.com> In-Reply-To: <20201227211232.117801-11-hdegoede@redhat.com> From: Andy Shevchenko Date: Mon, 28 Dec 2020 16:16:17 +0200 Message-ID: Subject: Re: [PATCH 10/14] extcon: arizona: Also report jack state through snd_soc_jack_report() To: Hans de Goede Content-Type: text/plain; charset="UTF-8" Cc: Cezary Rojewski , ALSA Development Mailing List , patches@opensource.cirrus.com, Mark Brown , Jie Yang , Pierre-Louis Bossart , Linux Kernel Mailing List , Liam Girdwood , Chanwoo Choi , MyungJoo Ham , Lee Jones 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" On Sun, Dec 27, 2020 at 11:16 PM Hans de Goede wrote: > > The Linux Arizona driver uses the MFD framework to create several > sub-devices for the Arizona codec and then uses a driver per function. > > The extcon-arizona driver handles jack-detect support and exports info > about the jack state to userspace through the standard extcon sysfs > class interface. > > Standard Linux userspace does not monitor/use the extcon sysfs interface > for jack-detection, resulting in the jack-state not being taken into > account by userspace. > > The ASoC machine-driver may have created a standard ASoC jack when > registering the card. In this case also report the jack-state through the > ASoC jack so that jack-detection works with standard Linux userspace. > > Signed-off-by: Hans de Goede > --- > drivers/extcon/extcon-arizona.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c > index d5b3231744f9..931a7d239aea 100644 > --- a/drivers/extcon/extcon-arizona.c > +++ b/drivers/extcon/extcon-arizona.c > @@ -20,6 +20,7 @@ > #include > #include > > +#include > #include > > #include > @@ -598,11 +599,19 @@ static int arizona_hpdet_do_id(struct arizona_extcon_info *info, int *reading, > static void arizona_set_extcon_state(struct arizona_extcon_info *info, > unsigned int id, bool state) > { > - int ret; > + int ret, mask = 0; I would rather prefer... drop assignment here... > ret = extcon_set_state_sync(info->edev, id, state); > if (ret) > dev_err(info->arizona->dev, "Failed to set extcon state: %d\n", ret); > + > + switch (id) { > + case EXTCON_JACK_HEADPHONE: mask = SND_JACK_HEADPHONE; break; > + case EXTCON_JACK_MICROPHONE: mask = SND_JACK_MICROPHONE; break; ...introduce default here, which immediately bails out (return)... > + } > + > + if (info->arizona->jack && mask) ...and drop mask check here. > + snd_soc_jack_report(info->arizona->jack, state ? mask : 0, mask); > } > > static irqreturn_t arizona_hpdet_irq(int irq, void *data) > -- > 2.28.0 > -- With Best Regards, Andy Shevchenko