* [PATCH v2 RESEND 0/2] Make headphone work on Huawei Matebook D15 @ 2022-04-05 13:53 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 6+ messages in thread From: Mauro Carvalho Chehab @ 2022-04-05 13:53 UTC (permalink / raw) To: Pierre-Louis Bossart Cc: Cezary Rojewski, alsa-devel, Bard Liao, Jie Yang, Takashi Iwai, Liam Girdwood, Hans de Goede, Mark Brown, Mauro Carvalho Chehab, Péter Ujfalusi, linux-kernel (resent, as the From/SoB at the patches were using my past e-mail. No changes here, except by having Hans ack and have the From/SoB fixed) At Huawei Matebook D15 two different GPIOs are used to control the output: - gpio0 controls the speaker output; - gpio1 controls the headphone output. Changing both at the same time cause spurious events that are mis-interpreted as input events, causing troubles on apps. So, a delay is needed before turning on such gpios. With this patch, plugging a headphone causes a jack event to trigger the speaker supply, powering down the speaker and powering up the headphone output. Removing the headphone also triggers the power supply, powering up the speaker and powering down the headphone. Mauro Carvalho Chehab (2): ASoC: Intel: sof_es8336: support a separate gpio to control headphone ASoC: Intel: sof_es8336: Huawei Matebook D15 uses a headphone gpio sound/soc/intel/boards/sof_es8336.c | 68 ++++++++++++++++++++++++----- 1 file changed, 58 insertions(+), 10 deletions(-) -- 2.35.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 RESEND 0/2] Make headphone work on Huawei Matebook D15 @ 2022-04-05 13:53 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 6+ messages in thread From: Mauro Carvalho Chehab @ 2022-04-05 13:53 UTC (permalink / raw) To: Pierre-Louis Bossart Cc: Mauro Carvalho Chehab, Hans de Goede, Péter Ujfalusi, Bard Liao, Cezary Rojewski, Jaroslav Kysela, Jie Yang, Liam Girdwood, Mark Brown, Takashi Iwai, alsa-devel, linux-kernel (resent, as the From/SoB at the patches were using my past e-mail. No changes here, except by having Hans ack and have the From/SoB fixed) At Huawei Matebook D15 two different GPIOs are used to control the output: - gpio0 controls the speaker output; - gpio1 controls the headphone output. Changing both at the same time cause spurious events that are mis-interpreted as input events, causing troubles on apps. So, a delay is needed before turning on such gpios. With this patch, plugging a headphone causes a jack event to trigger the speaker supply, powering down the speaker and powering up the headphone output. Removing the headphone also triggers the power supply, powering up the speaker and powering down the headphone. Mauro Carvalho Chehab (2): ASoC: Intel: sof_es8336: support a separate gpio to control headphone ASoC: Intel: sof_es8336: Huawei Matebook D15 uses a headphone gpio sound/soc/intel/boards/sof_es8336.c | 68 ++++++++++++++++++++++++----- 1 file changed, 58 insertions(+), 10 deletions(-) -- 2.35.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 RESEND 1/2] ASoC: Intel: sof_es8336: support a separate gpio to control headphone 2022-04-05 13:53 ` Mauro Carvalho Chehab @ 2022-04-05 13:53 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 6+ messages in thread From: Mauro Carvalho Chehab @ 2022-04-05 13:53 UTC (permalink / raw) To: Pierre-Louis Bossart Cc: Cezary Rojewski, alsa-devel, Bard Liao, Jie Yang, Takashi Iwai, Liam Girdwood, Hans de Goede, Mark Brown, Mauro Carvalho Chehab, Péter Ujfalusi, linux-kernel Some devices may use both gpio0 and gpio1 to independently switch the speaker and the headphone. Add support for that. Acked-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org> --- See [PATCH v2 RESEND 0/2] at: https://lore.kernel.org/all/cover.1649166634.git.mchehab@kernel.org/ sound/soc/intel/boards/sof_es8336.c | 60 ++++++++++++++++++++++++----- 1 file changed, 50 insertions(+), 10 deletions(-) diff --git a/sound/soc/intel/boards/sof_es8336.c b/sound/soc/intel/boards/sof_es8336.c index 5e0529aa4f1d..bcd80870d252 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,7 +40,7 @@ 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; @@ -51,15 +52,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 +85,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) @@ -83,13 +99,24 @@ static int sof_es8316_speaker_power_event(struct snd_soc_dapm_widget *w, struct snd_soc_card *card = w->dapm->card; struct sof_es8336_private *priv = snd_soc_card_get_drvdata(card); + if (priv->speaker_en == !SND_SOC_DAPM_EVENT_ON(event)) + return 0; + + priv->speaker_en = !SND_SOC_DAPM_EVENT_ON(event); + 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); + 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, priv->speaker_en); + return 0; } @@ -114,7 +141,7 @@ 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"}, @@ -233,8 +260,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 +625,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); -- 2.35.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 RESEND 1/2] ASoC: Intel: sof_es8336: support a separate gpio to control headphone @ 2022-04-05 13:53 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 6+ messages in thread From: Mauro Carvalho Chehab @ 2022-04-05 13:53 UTC (permalink / raw) To: Pierre-Louis Bossart Cc: Mauro Carvalho Chehab, Hans de Goede, Péter Ujfalusi, Bard Liao, Cezary Rojewski, Jaroslav Kysela, Jie Yang, Liam Girdwood, Mark Brown, Takashi Iwai, alsa-devel, linux-kernel Some devices may use both gpio0 and gpio1 to independently switch the speaker and the headphone. Add support for that. Acked-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org> --- See [PATCH v2 RESEND 0/2] at: https://lore.kernel.org/all/cover.1649166634.git.mchehab@kernel.org/ sound/soc/intel/boards/sof_es8336.c | 60 ++++++++++++++++++++++++----- 1 file changed, 50 insertions(+), 10 deletions(-) diff --git a/sound/soc/intel/boards/sof_es8336.c b/sound/soc/intel/boards/sof_es8336.c index 5e0529aa4f1d..bcd80870d252 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,7 +40,7 @@ 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; @@ -51,15 +52,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 +85,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) @@ -83,13 +99,24 @@ static int sof_es8316_speaker_power_event(struct snd_soc_dapm_widget *w, struct snd_soc_card *card = w->dapm->card; struct sof_es8336_private *priv = snd_soc_card_get_drvdata(card); + if (priv->speaker_en == !SND_SOC_DAPM_EVENT_ON(event)) + return 0; + + priv->speaker_en = !SND_SOC_DAPM_EVENT_ON(event); + 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); + 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, priv->speaker_en); + return 0; } @@ -114,7 +141,7 @@ 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"}, @@ -233,8 +260,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 +625,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); -- 2.35.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 RESEND 2/2] ASoC: Intel: sof_es8336: Huawei Matebook D15 uses a headphone gpio 2022-04-05 13:53 ` Mauro Carvalho Chehab @ 2022-04-05 13:53 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 6+ messages in thread From: Mauro Carvalho Chehab @ 2022-04-05 13:53 UTC (permalink / raw) To: Pierre-Louis Bossart Cc: Cezary Rojewski, alsa-devel, Bard Liao, Jie Yang, Takashi Iwai, Liam Girdwood, Hans de Goede, Mark Brown, Mauro Carvalho Chehab, Péter Ujfalusi, linux-kernel 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 <mchehab@kernel.org> --- See [PATCH v2 RESEND 0/2] at: https://lore.kernel.org/all/cover.1649166634.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 bcd80870d252..79cf9777c4fc 100644 --- a/sound/soc/intel/boards/sof_es8336.c +++ b/sound/soc/intel/boards/sof_es8336.c @@ -292,6 +292,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) + }, {} }; -- 2.35.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 RESEND 2/2] ASoC: Intel: sof_es8336: Huawei Matebook D15 uses a headphone gpio @ 2022-04-05 13:53 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 6+ messages in thread From: Mauro Carvalho Chehab @ 2022-04-05 13:53 UTC (permalink / raw) To: Pierre-Louis Bossart Cc: Mauro Carvalho Chehab, Hans de Goede, Péter Ujfalusi, Bard Liao, Cezary Rojewski, Jaroslav Kysela, Jie Yang, Liam Girdwood, Mark Brown, Takashi Iwai, alsa-devel, linux-kernel 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 <mchehab@kernel.org> --- See [PATCH v2 RESEND 0/2] at: https://lore.kernel.org/all/cover.1649166634.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 bcd80870d252..79cf9777c4fc 100644 --- a/sound/soc/intel/boards/sof_es8336.c +++ b/sound/soc/intel/boards/sof_es8336.c @@ -292,6 +292,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) + }, {} }; -- 2.35.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-04-05 23:42 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-04-05 13:53 [PATCH v2 RESEND 0/2] Make headphone work on Huawei Matebook D15 Mauro Carvalho Chehab 2022-04-05 13:53 ` Mauro Carvalho Chehab 2022-04-05 13:53 ` [PATCH v2 RESEND 1/2] ASoC: Intel: sof_es8336: support a separate gpio to control headphone Mauro Carvalho Chehab 2022-04-05 13:53 ` Mauro Carvalho Chehab 2022-04-05 13:53 ` [PATCH v2 RESEND 2/2] ASoC: Intel: sof_es8336: Huawei Matebook D15 uses a headphone gpio Mauro Carvalho Chehab 2022-04-05 13:53 ` Mauro Carvalho Chehab
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.