From patchwork Sun Apr 3 08:59:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 555926 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 BB5E2C433F5 for ; Sun, 3 Apr 2022 09:00:32 +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 13D3D16FA; Sun, 3 Apr 2022 10:59:40 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 13D3D16FA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1648976430; bh=+Ovtq48x9WL5YWh33WVxrg+kW8FgwJJJ7TN4VKMgd2A=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=fG++ovGja8i7K9lg9so7am6Vtb5nVNVOjsWnXUj6w82U88izgyNAlMzUFPTqXwnPY EneXmLFLC5l9naMJ7MwhqF9M2YTOcaw0/DAFLBVIbKPFyJP8wqGW8TA5owb52yenUc oOqFyCO6POZWNaTryREW9l59nCJJC0kuGFUEeHHI= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 9F679F8012A; Sun, 3 Apr 2022 10:59:39 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E3CDFF8028B; Sun, 3 Apr 2022 10:59:37 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 66981F80100 for ; Sun, 3 Apr 2022 10:59:34 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 66981F80100 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Wn7ZsKtU" Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C84C260FE1; Sun, 3 Apr 2022 08:59:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1FD09C340ED; Sun, 3 Apr 2022 08:59:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648976371; bh=+Ovtq48x9WL5YWh33WVxrg+kW8FgwJJJ7TN4VKMgd2A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wn7ZsKtU5/LIt20FVIU+LruzwbQQhvTwUzUso8KkfOCC31Hf2S5lmWk7ZIf42xQzV vkdWEokkgWAoeWYusINceJ4rUbOEFWRFCQP0RnwUGg7GjkGM4erSvDPVG00R3mUWAJ wjjcXar7QLc4P+RfFsdUQL4ZpWUBI+aPgVBAdRBMTWwFjuyD8lQX7MpNeM076vRAuz CwbjM1rg6+7GWjUCLYvjwqL9/d1nN6jb0DBQAF3fl6LxgBT7w6YGEQMSvgPfG8wEhX wLPGEn4zwe0fH268gsTDtI7agn/7OPVc+MlZxFCCe66BiKoeYL96Ux3WXHAT2pvwSI dcwEWbOK2H1Bg== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1naw52-00D6f4-JN; Sun, 03 Apr 2022 10:59:28 +0200 From: Mauro Carvalho Chehab To: Pierre-Louis Bossart Subject: [PATCH RFC 1/2] ASoC: Intel: sof_es8336: support a separate gpio to control headphone Date: Sun, 3 Apr 2022 10:59:24 +0200 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Cc: Cezary Rojewski , alsa-devel@alsa-project.org, Mauro Carvalho Chehab , Bard Liao , Jie Yang , Takashi Iwai , Liam Girdwood , Hans de Goede , Mark Brown , Mauro Carvalho Chehab , =?utf-8?q?P=C3=A9ter_Ujfalusi?= , linux-kernel@vger.kernel.org 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" From: Mauro Carvalho Chehab Some devices may use both gpio0 and gpio1 to independently switch the speaker and the headphone. Add support for that. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- See [PATCH RFC 0/2] at: https://lore.kernel.org/all/cover.1648975926.git.mchehab@kernel.org/ sound/soc/intel/boards/sof_es8336.c | 76 +++++++++++++++++++++-------- 1 file changed, 57 insertions(+), 19 deletions(-) diff --git a/sound/soc/intel/boards/sof_es8336.c b/sound/soc/intel/boards/sof_es8336.c index 5e0529aa4f1d..96920d3eed8a 100644 --- a/sound/soc/intel/boards/sof_es8336.c +++ b/sound/soc/intel/boards/sof_es8336.c @@ -30,6 +30,7 @@ #define SOF_ES8336_TGL_GPIO_QUIRK BIT(4) #define SOF_ES8336_ENABLE_DMIC BIT(5) #define SOF_ES8336_JD_INVERTED BIT(6) +#define SOF_ES8336_HEADPHONE_GPIO BIT(7) static unsigned long quirk; @@ -39,10 +40,9 @@ MODULE_PARM_DESC(quirk, "Board-specific quirk override"); struct sof_es8336_private { struct device *codec_dev; - struct gpio_desc *gpio_pa; + struct gpio_desc *gpio_pa, *gpio_pa_headphone; struct snd_soc_jack jack; struct list_head hdmi_pcm_list; - bool speaker_en; }; struct sof_hdmi_pcm { @@ -51,15 +51,28 @@ struct sof_hdmi_pcm { int device; }; -static const struct acpi_gpio_params pa_enable_gpio = { 0, 0, true }; +static const struct acpi_gpio_params pa_enable_gpio0 = { 0, 0, true }; +static const struct acpi_gpio_params pa_enable_gpio1 = { 1, 0, true }; + static const struct acpi_gpio_mapping acpi_es8336_gpios[] = { - { "pa-enable-gpios", &pa_enable_gpio, 1 }, + { "pa-enable-gpios", &pa_enable_gpio0, 1 }, { } }; -static const struct acpi_gpio_params quirk_pa_enable_gpio = { 1, 0, true }; static const struct acpi_gpio_mapping quirk_acpi_es8336_gpios[] = { - { "pa-enable-gpios", &quirk_pa_enable_gpio, 1 }, + { "pa-enable-gpios", &pa_enable_gpio1, 1 }, + { } +}; + +static const struct acpi_gpio_mapping quirk_acpi_headphone_es8336_gpios[] = { + { "pa-enable-gpios", &pa_enable_gpio0, 1 }, + { "pa-enable-headphone-gpios", &pa_enable_gpio1, 1 }, + { } +}; + +static const struct acpi_gpio_mapping quirk_tgl_acpi_headphone_es8336_gpios[] = { + { "pa-enable-gpios", &pa_enable_gpio1, 1 }, + { "pa-enable-headphone-gpios", &pa_enable_gpio0, 1 }, { } }; @@ -71,6 +84,8 @@ static void log_quirks(struct device *dev) dev_info(dev, "quirk SSP%ld\n", SOF_ES8336_SSP_CODEC(quirk)); if (quirk & SOF_ES8336_ENABLE_DMIC) dev_info(dev, "quirk DMIC enabled\n"); + if (quirk & SOF_ES8336_HEADPHONE_GPIO) + dev_info(dev, "quirk headphone GPIO enabled\n"); if (quirk & SOF_ES8336_TGL_GPIO_QUIRK) dev_info(dev, "quirk TGL GPIO enabled\n"); if (quirk & SOF_ES8336_JD_INVERTED) @@ -84,24 +99,35 @@ static int sof_es8316_speaker_power_event(struct snd_soc_dapm_widget *w, struct sof_es8336_private *priv = snd_soc_card_get_drvdata(card); if (SND_SOC_DAPM_EVENT_ON(event)) - priv->speaker_en = false; - else - priv->speaker_en = true; + msleep(70); - gpiod_set_value_cansleep(priv->gpio_pa, priv->speaker_en); + gpiod_set_value_cansleep(priv->gpio_pa, !SND_SOC_DAPM_EVENT_ON(event)); + + return 0; +} + +static int sof_es8316_headphone_power_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_card *card = w->dapm->card; + struct sof_es8336_private *priv = snd_soc_card_get_drvdata(card); + + if (!(quirk & SOF_ES8336_HEADPHONE_GPIO)) + return 0; + + if (SND_SOC_DAPM_EVENT_ON(event)) + msleep(70); + + gpiod_set_value_cansleep(priv->gpio_pa_headphone, SND_SOC_DAPM_EVENT_ON(event)); return 0; } static const struct snd_soc_dapm_widget sof_es8316_widgets[] = { - SND_SOC_DAPM_SPK("Speaker", NULL), - SND_SOC_DAPM_HP("Headphone", NULL), + SND_SOC_DAPM_SPK("Speaker", sof_es8316_speaker_power_event), + SND_SOC_DAPM_HP("Headphone", sof_es8316_headphone_power_event), SND_SOC_DAPM_MIC("Headset Mic", NULL), SND_SOC_DAPM_MIC("Internal Mic", NULL), - - SND_SOC_DAPM_SUPPLY("Speaker Power", SND_SOC_NOPM, 0, 0, - sof_es8316_speaker_power_event, - SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU), }; static const struct snd_soc_dapm_widget dmic_widgets[] = { @@ -114,11 +140,10 @@ static const struct snd_soc_dapm_route sof_es8316_audio_map[] = { /* * There is no separate speaker output instead the speakers are muxed to - * the HP outputs. The mux is controlled by the "Speaker Power" supply. + * the HP outputs. The mux is controlled Speaker and/or headphone switch. */ {"Speaker", NULL, "HPOL"}, {"Speaker", NULL, "HPOR"}, - {"Speaker", NULL, "Speaker Power"}, }; static const struct snd_soc_dapm_route sof_es8316_intmic_in1_map[] = { @@ -233,8 +258,14 @@ static int sof_es8336_quirk_cb(const struct dmi_system_id *id) { quirk = (unsigned long)id->driver_data; - if (quirk & SOF_ES8336_TGL_GPIO_QUIRK) + if (quirk & SOF_ES8336_HEADPHONE_GPIO) { + if (quirk & SOF_ES8336_TGL_GPIO_QUIRK) + gpio_mapping = quirk_tgl_acpi_headphone_es8336_gpios; + else + gpio_mapping = quirk_acpi_headphone_es8336_gpios; + } else if (quirk & SOF_ES8336_TGL_GPIO_QUIRK) { gpio_mapping = quirk_acpi_es8336_gpios; + } return 1; } @@ -592,6 +623,13 @@ static int sof_es8336_probe(struct platform_device *pdev) goto err_put_codec; } + priv->gpio_pa_headphone = gpiod_get_optional(codec_dev, "pa-enable-headphone", GPIOD_OUT_LOW); + if (IS_ERR(priv->gpio_pa_headphone)) { + ret = dev_err_probe(dev, PTR_ERR(priv->gpio_pa_headphone), + "could not get pa-enable-headphone GPIO\n"); + goto err_put_codec; + } + INIT_LIST_HEAD(&priv->hdmi_pcm_list); snd_soc_card_set_drvdata(card, priv); From patchwork Sun Apr 3 08:59:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 556230 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 09A77C433EF for ; Sun, 3 Apr 2022 09:01:05 +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 1D6121745; Sun, 3 Apr 2022 11:00:13 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 1D6121745 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1648976463; bh=8NKDu5zCu7H/G9k0E5Bk0gLf0mwDJcqOkFVjnVIzf/U=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=p9yTKltHfiZ/g2iFxAYh575yr5oVII8lPPHvGnADjKZ6i2P2uQZZGGNef3a09liGN uT1EOnJr7JbekAwpi9SVsaMjvjjryeJHZIYSzV0Or9fzHtY1S/E6rOmxIyIu7xcFno KbMXy+jcNyM/f4t1XMjLjt0FxYzamXHUnWlYK+a4= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 77C34F804CA; Sun, 3 Apr 2022 10:59:40 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id EB780F8028B; Sun, 3 Apr 2022 10:59:38 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id DF9FDF8013F for ; Sun, 3 Apr 2022 10:59:33 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz DF9FDF8013F Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Q6A3008E" Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D04E060F43; Sun, 3 Apr 2022 08:59:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 261E9C36AE3; Sun, 3 Apr 2022 08:59:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648976371; bh=8NKDu5zCu7H/G9k0E5Bk0gLf0mwDJcqOkFVjnVIzf/U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q6A3008EXzY+Ctoi7fg8HJhZuPlPKPT2rgVwf8xPIOZMkgp8xjpVi2obAI8fhwlls yHH77Jqfvejwt7sr0biqLKkhCQ6ydg5xIVDhjLtSBvJZ1uI4wldA7IxvI8SsL3/bk7 Ii2RLcaES4zIBYuGQJM2TCFeDxAfjz2JQxtoizGj9i6osZSrR747yRPzPbizvJ+f2p 1ScWo9XJPtV7hfANnNN7RujQB0XcyH6iES/92qVxCMM404Mfb+nX902OofKEYAKi6M GHkU6qEpl5JfixJsOC/sZYhzO5QFI/vONNbFD7+YJCGJQRHMc4LLF49Si6q2YLdfqJ SmuYiCMrUeftw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1naw52-00D6f8-N1; Sun, 03 Apr 2022 10:59:28 +0200 From: Mauro Carvalho Chehab To: Pierre-Louis Bossart Subject: [PATCH RFC 2/2] ASoC: Intel: sof_es8336: Huawei Matebook D15 uses a headphone gpio Date: Sun, 3 Apr 2022 10:59:25 +0200 Message-Id: <67d97e8a367511bc593395f33edcf2391f8066ef.1648975926.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Cc: Cezary Rojewski , alsa-devel@alsa-project.org, Mauro Carvalho Chehab , Bard Liao , Jie Yang , Takashi Iwai , Liam Girdwood , Hans de Goede , Mark Brown , Mauro Carvalho Chehab , =?utf-8?q?P=C3=A9ter_Ujfalusi?= , linux-kernel@vger.kernel.org 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" From: Mauro Carvalho Chehab Based on experimental tests, Huawei Matebook D15 actually uses both gpio0 and gpio1: the first one controls the speaker, while the other one controls the headphone. Add a quirk for that. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- See [PATCH RFC 0/2] at: https://lore.kernel.org/all/cover.1648975926.git.mchehab@kernel.org/ sound/soc/intel/boards/sof_es8336.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/soc/intel/boards/sof_es8336.c b/sound/soc/intel/boards/sof_es8336.c index 96920d3eed8a..fd47aba1bd5d 100644 --- a/sound/soc/intel/boards/sof_es8336.c +++ b/sound/soc/intel/boards/sof_es8336.c @@ -290,6 +290,14 @@ static const struct dmi_system_id sof_es8336_quirk_table[] = { }, .driver_data = (void *)(SOF_ES8336_TGL_GPIO_QUIRK) }, + { + .callback = sof_es8336_quirk_cb, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "HUAWEI"), + DMI_MATCH(DMI_BOARD_NAME, "BOHB-WAX9-PCB-B2"), + }, + .driver_data = (void *)(SOF_ES8336_HEADPHONE_GPIO) + }, {} };