ALSA: hda: cs35l41: Use reset label to get GPIO for HP Zbook Fury 17 G9

This laptop has an incorrect setting in its _DSD for boost type, but
the rest of the _DSD is correct, and we can still use the reset label
to obtain the reset gpio.

Also fix channel map so that amp 0 is right, and amp 1 is left.

Fixes: 581523ee3652 ("ALSA: hda: cs35l41: Override the _DSD for HP Zbook Fury 17 G9 to correct boost type")
Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20231026150558.2105827-2-sbinding@opensource.cirrus.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/hda/cs35l41_hda_property.c b/sound/pci/hda/cs35l41_hda_property.c
index b62a4e6968e2694b8ee295b1df3229a7f02855ec..c83328971728f4f8daca0bd56b786fb421f693df 100644 (file)
--- a/sound/pci/hda/cs35l41_hda_property.c
+++ b/sound/pci/hda/cs35l41_hda_property.c
@@ -58,9 +58,16 @@ static int hp_vision_acpi_fix(struct cs35l41_hda *cs35l41, struct device *physde
 
        cs35l41->index = id;
        cs35l41->channel_index = 0;
-       cs35l41->reset_gpio = gpiod_get_index(physdev, NULL, 1, GPIOD_OUT_HIGH);
+
+       /*
+        * This system has _DSD, it just contains an error, so we can still get the reset using
+        * the "reset" label.
+        */
+       cs35l41->reset_gpio = fwnode_gpiod_get_index(acpi_fwnode_handle(cs35l41->dacpi), "reset",
+                                                    cs35l41->index, GPIOD_OUT_LOW,
+                                                    "cs35l41-reset");
        cs35l41->speaker_id = -ENOENT;
-       hw_cfg->spk_pos = cs35l41->index ? 1 : 0; // right:left
+       hw_cfg->spk_pos = cs35l41->index ? 0 : 1; // right:left
        hw_cfg->gpio1.func = CS35L41_NOT_USED;
        hw_cfg->gpio1.valid = true;
        hw_cfg->gpio2.func = CS35L41_INTERRUPT;