From: Stefan Binding <sbinding@opensource.cirrus.com>
To: Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
"Mark Brown" <broonie@kernel.org>
Cc: <alsa-devel@alsa-project.org>, <linux-kernel@vger.kernel.org>,
<linux-sound@vger.kernel.org>, <patches@opensource.cirrus.com>,
"Stefan Binding" <sbinding@opensource.cirrus.com>
Subject: [PATCH v1 1/8] ALSA: hda: cs35l41: Use reset label to get GPIO for HP Zbook Fury 17 G9
Date: Thu, 26 Oct 2023 16:05:51 +0100 [thread overview]
Message-ID: <20231026150558.2105827-2-sbinding@opensource.cirrus.com> (raw)
In-Reply-To: <20231026150558.2105827-1-sbinding@opensource.cirrus.com>
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>
---
sound/pci/hda/cs35l41_hda_property.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/sound/pci/hda/cs35l41_hda_property.c b/sound/pci/hda/cs35l41_hda_property.c
index b62a4e6968e2..c83328971728 100644
--- 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;
--
2.34.1
next prev parent reply other threads:[~2023-10-26 15:06 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-26 15:05 [PATCH v1 0/8] System Suspend fixes and improvements for CS35L41 HDA Stefan Binding
2023-10-26 15:05 ` Stefan Binding [this message]
2023-10-26 15:05 ` [PATCH v1 2/8] ALSA: hda: cs35l41: Assert reset before system suspend Stefan Binding
2023-10-26 15:05 ` [PATCH v1 3/8] ALSA: hda: cs35l41: Assert Reset prior to de-asserting in probe and system resume Stefan Binding
2023-10-26 15:05 ` [PATCH v1 4/8] ALSA: hda: cs35l41: Run boot process during resume callbacks Stefan Binding
2023-10-26 15:05 ` [PATCH v1 5/8] ALSA: hda: cs35l41: Force a software reset after hardware reset Stefan Binding
2023-10-26 15:05 ` [PATCH v1 6/8] ALSA: hda: cs35l41: Do not unload firmware before reset in system suspend Stefan Binding
2023-10-26 15:05 ` [PATCH v1 7/8] ALSA: hda: cs35l41: Check CSPL state after loading firmware Stefan Binding
2023-10-26 15:05 ` [PATCH v1 8/8] ASoC: cs35l41: Detect CSPL errors when sending CSPL commands Stefan Binding
2023-10-26 15:09 ` Mark Brown
2023-10-26 16:02 ` [PATCH v1 0/8] System Suspend fixes and improvements for CS35L41 HDA Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231026150558.2105827-2-sbinding@opensource.cirrus.com \
--to=sbinding@opensource.cirrus.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=patches@opensource.cirrus.com \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox