| Message ID | 0f1e8233fc6744c3d78353e4a20f9669035e693d.1649147890.git.mchehab@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Make headphone work on Huawei Matebook D15 | expand |
On 4/5/22 03:44, Mauro Carvalho Chehab wrote: > From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > > 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 <mchehab+huawei@kernel.org> > Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org> > --- > > See [PATCH v2 0/2] at: https://lore.kernel.org/all/cover.1649147890.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 }, > { } This is starting to be a bit messy, the initial gpios were really intended for speakers and should be clearly referring to speakers now. the TGL quirk really means gpio1 is used instead of gpio0, and I can't figure out what the 'pa' prefix is needed for. Can I suggest the attached cleanup patch be added first? That would make it clearer and more readable IMHO. Compile-tested only since I don't have hardware. Thanks!
Em Tue, 5 Apr 2022 09:57:30 -0500 Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> escreveu: > On 4/5/22 03:44, Mauro Carvalho Chehab wrote: > > From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > > > > 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 <mchehab+huawei@kernel.org> > > Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org> > > --- > > > > See [PATCH v2 0/2] at: https://lore.kernel.org/all/cover.1649147890.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 }, > > { } > > This is starting to be a bit messy, the initial gpios were really > intended for speakers and should be clearly referring to speakers now. > the TGL quirk really means gpio1 is used instead of gpio0, and I can't > figure out what the 'pa' prefix is needed for. > > Can I suggest the attached cleanup patch be added first? That would make > it clearer and more readable IMHO. Compile-tested only since I don't > have hardware. Makes sense. I'll place it before the first patch, rebase them, test and re-submit. > Thanks! Thanks! Mauro
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);