mirror of
https://abf.rosa.ru/djam/kernel-5.15.git
synced 2025-02-23 10:32:54 +00:00
57 lines
2.4 KiB
Diff
57 lines
2.4 KiB
Diff
From a47f6edd5509c6b638ae726f6f1c9c22c864a3ee Mon Sep 17 00:00:00 2001
|
|
From: Andrey Turkin <andrey.turkin@gmail.com>
|
|
Date: Mon, 25 Jul 2022 14:49:03 -0500
|
|
Subject: [PATCH 418/424] ASoC: Intel: sof_es8336: ignore GpioInt when looking
|
|
for speaker/headset GPIO lines
|
|
|
|
This fixes speaker GPIO detection on machines those ACPI tables
|
|
list their jack detection GpioInt before output GpioIo.
|
|
GpioInt entry can never be the speaker/headphone amplifier control
|
|
so it makes sense to only look for GpioIo entries when looking for them.
|
|
|
|
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
|
Signed-off-by: Andrey Turkin <andrey.turkin@gmail.com>
|
|
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
|
Link: https://lore.kernel.org/r/20220725194909.145418-5-pierre-louis.bossart@linux.intel.com
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
---
|
|
sound/soc/intel/boards/sof_es8336.c | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/sound/soc/intel/boards/sof_es8336.c b/sound/soc/intel/boards/sof_es8336.c
|
|
index 81e12f03e..dade1749c 100644
|
|
--- a/sound/soc/intel/boards/sof_es8336.c
|
|
+++ b/sound/soc/intel/boards/sof_es8336.c
|
|
@@ -57,23 +57,23 @@ static const struct acpi_gpio_params enable_gpio0 = { 0, 0, true };
|
|
static const struct acpi_gpio_params enable_gpio1 = { 1, 0, true };
|
|
|
|
static const struct acpi_gpio_mapping acpi_speakers_enable_gpio0[] = {
|
|
- { "speakers-enable-gpios", &enable_gpio0, 1 },
|
|
+ { "speakers-enable-gpios", &enable_gpio0, 1, ACPI_GPIO_QUIRK_ONLY_GPIOIO },
|
|
{ }
|
|
};
|
|
|
|
static const struct acpi_gpio_mapping acpi_speakers_enable_gpio1[] = {
|
|
- { "speakers-enable-gpios", &enable_gpio1, 1 },
|
|
+ { "speakers-enable-gpios", &enable_gpio1, 1, ACPI_GPIO_QUIRK_ONLY_GPIOIO },
|
|
};
|
|
|
|
static const struct acpi_gpio_mapping acpi_enable_both_gpios[] = {
|
|
- { "speakers-enable-gpios", &enable_gpio0, 1 },
|
|
- { "headphone-enable-gpios", &enable_gpio1, 1 },
|
|
+ { "speakers-enable-gpios", &enable_gpio0, 1, ACPI_GPIO_QUIRK_ONLY_GPIOIO },
|
|
+ { "headphone-enable-gpios", &enable_gpio1, 1, ACPI_GPIO_QUIRK_ONLY_GPIOIO },
|
|
{ }
|
|
};
|
|
|
|
static const struct acpi_gpio_mapping acpi_enable_both_gpios_rev_order[] = {
|
|
- { "speakers-enable-gpios", &enable_gpio1, 1 },
|
|
- { "headphone-enable-gpios", &enable_gpio0, 1 },
|
|
+ { "speakers-enable-gpios", &enable_gpio1, 1, ACPI_GPIO_QUIRK_ONLY_GPIOIO },
|
|
+ { "headphone-enable-gpios", &enable_gpio0, 1, ACPI_GPIO_QUIRK_ONLY_GPIOIO },
|
|
{ }
|
|
};
|
|
|
|
--
|
|
2.35.2
|
|
|