From: Lucas Tanure <tanureal@opensource.cirrus.com>
To: Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
Cameron Berkenpas <cam@neo-zeon.de>
Cc: patches@opensource.cirrus.com, alsa-devel@alsa-project.org,
linux-kernel@vger.kernel.org,
Lucas Tanure <tanureal@opensource.cirrus.com>
Subject: [PATCH 1/2] ALSA: hda: cs35l41: Use the CS35L41 HDA internal define
Date: Tue, 26 Jul 2022 11:11:30 +0100 [thread overview]
Message-ID: <20220726101131.68058-2-tanureal@opensource.cirrus.com> (raw)
In-Reply-To: <20220726101131.68058-1-tanureal@opensource.cirrus.com>
Follow GPIO1 pattern, use cs35l41 HDA internal define for
IRQ and then translate to ASoC cs35l41 define.
Signed-off-by: Lucas Tanure <tanureal@opensource.cirrus.com>
---
sound/pci/hda/cs35l41_hda.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sound/pci/hda/cs35l41_hda.c b/sound/pci/hda/cs35l41_hda.c
index 28798d5c1cf1..48d94c683b75 100644
--- a/sound/pci/hda/cs35l41_hda.c
+++ b/sound/pci/hda/cs35l41_hda.c
@@ -1014,6 +1014,7 @@ static int cs35l41_hda_apply_properties(struct cs35l41_hda *cs35l41)
break;
case CS35L41_INTERRUPT:
using_irq = true;
+ hw_cfg->gpio2.func = CS35L41_GPIO2_INT_OPEN_DRAIN;
break;
default:
dev_err(cs35l41->dev, "Invalid GPIO2 function %d\n", hw_cfg->gpio2.func);
@@ -1273,7 +1274,7 @@ static int cs35l41_hda_read_acpi(struct cs35l41_hda *cs35l41, const char *hid, i
cs35l41->reset_gpio = gpiod_get_index(physdev, NULL, 0, GPIOD_OUT_HIGH);
cs35l41->hw_cfg.bst_type = CS35L41_EXT_BOOST_NO_VSPK_SWITCH;
cs35l41->speaker_id = cs35l41_get_speaker_id(physdev, 0, 0, 2);
- hw_cfg->gpio2.func = CS35L41_GPIO2_INT_OPEN_DRAIN;
+ hw_cfg->gpio2.func = CS35L41_INTERRUPT;
hw_cfg->gpio2.valid = true;
cs35l41->hw_cfg.valid = true;
put_device(physdev);
--
2.37.1
WARNING: multiple messages have this Message-ID (diff)
From: Lucas Tanure <tanureal@opensource.cirrus.com>
To: Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
Cameron Berkenpas <cam@neo-zeon.de>
Cc: <alsa-devel@alsa-project.org>, <patches@opensource.cirrus.com>,
<linux-kernel@vger.kernel.org>,
Lucas Tanure <tanureal@opensource.cirrus.com>
Subject: [PATCH 1/2] ALSA: hda: cs35l41: Use the CS35L41 HDA internal define
Date: Tue, 26 Jul 2022 11:11:30 +0100 [thread overview]
Message-ID: <20220726101131.68058-2-tanureal@opensource.cirrus.com> (raw)
In-Reply-To: <20220726101131.68058-1-tanureal@opensource.cirrus.com>
Follow GPIO1 pattern, use cs35l41 HDA internal define for
IRQ and then translate to ASoC cs35l41 define.
Signed-off-by: Lucas Tanure <tanureal@opensource.cirrus.com>
---
sound/pci/hda/cs35l41_hda.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sound/pci/hda/cs35l41_hda.c b/sound/pci/hda/cs35l41_hda.c
index 28798d5c1cf1..48d94c683b75 100644
--- a/sound/pci/hda/cs35l41_hda.c
+++ b/sound/pci/hda/cs35l41_hda.c
@@ -1014,6 +1014,7 @@ static int cs35l41_hda_apply_properties(struct cs35l41_hda *cs35l41)
break;
case CS35L41_INTERRUPT:
using_irq = true;
+ hw_cfg->gpio2.func = CS35L41_GPIO2_INT_OPEN_DRAIN;
break;
default:
dev_err(cs35l41->dev, "Invalid GPIO2 function %d\n", hw_cfg->gpio2.func);
@@ -1273,7 +1274,7 @@ static int cs35l41_hda_read_acpi(struct cs35l41_hda *cs35l41, const char *hid, i
cs35l41->reset_gpio = gpiod_get_index(physdev, NULL, 0, GPIOD_OUT_HIGH);
cs35l41->hw_cfg.bst_type = CS35L41_EXT_BOOST_NO_VSPK_SWITCH;
cs35l41->speaker_id = cs35l41_get_speaker_id(physdev, 0, 0, 2);
- hw_cfg->gpio2.func = CS35L41_GPIO2_INT_OPEN_DRAIN;
+ hw_cfg->gpio2.func = CS35L41_INTERRUPT;
hw_cfg->gpio2.valid = true;
cs35l41->hw_cfg.valid = true;
put_device(physdev);
--
2.37.1
next prev parent reply other threads:[~2022-07-26 10:12 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-26 10:11 [PATCH 0/2] Add support for CLSA0101 Lucas Tanure
2022-07-26 10:11 ` Lucas Tanure
2022-07-26 10:11 ` Lucas Tanure [this message]
2022-07-26 10:11 ` [PATCH 1/2] ALSA: hda: cs35l41: Use the CS35L41 HDA internal define Lucas Tanure
2022-07-26 10:11 ` [PATCH 2/2] ALSA: hda: cs35l41: Support CLSA0101 Lucas Tanure
2022-07-26 10:11 ` Lucas Tanure
2022-07-26 12:47 ` [PATCH 0/2] Add support for CLSA0101 Takashi Iwai
2022-07-26 12:47 ` Takashi Iwai
2022-07-26 15:35 ` Cameron Berkenpas
2022-07-26 15:35 ` Cameron Berkenpas
2022-07-26 15:46 ` Takashi Iwai
2022-07-26 15:46 ` Takashi Iwai
2022-07-27 9:50 ` Lucas tanure
2022-07-27 9:50 ` Lucas tanure
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=20220726101131.68058-2-tanureal@opensource.cirrus.com \
--to=tanureal@opensource.cirrus.com \
--cc=alsa-devel@alsa-project.org \
--cc=cam@neo-zeon.de \
--cc=linux-kernel@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 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.