From: Baojun Xu <baojun.xu@ti.com>
To: <tiwai@suse.de>
Cc: <robh+dt@kernel.org>, <andriy.shevchenko@linux.intel.com>,
<lgirdwood@gmail.com>, <perex@perex.cz>,
<pierre-louis.bossart@linux.intel.com>, <kevin-lu@ti.com>,
<shenghao-ding@ti.com>, <navada@ti.com>, <13916275206@139.com>,
<v-hampiholi@ti.com>, <v-po@ti.com>, <niranjan.hy@ti.com>,
<alsa-devel@alsa-project.org>, <linux-kernel@vger.kernel.org>,
<liam.r.girdwood@intel.com>, <yung-chuan.liao@linux.intel.com>,
<baojun.xu@ti.com>, <broonie@kernel.org>, <soyer@irl.hu>
Subject: [PATCH v1] ALSA: hda/tas2781: Add speaker id check for ASUS projects
Date: Fri, 11 Oct 2024 16:53:03 +0800 [thread overview]
Message-ID: <20241011085303.738-1-baojun.xu@ti.com> (raw)
Add speaker id check by gpio in ACPI for ASUS projects.
Signed-off-by: Baojun Xu <baojun.xu@ti.com>
---
include/sound/tas2781.h | 3 +++
sound/pci/hda/tas2781_hda_i2c.c | 39 ++++++++++++++++++++++++++++++---
2 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/include/sound/tas2781.h b/include/sound/tas2781.h
index 8cd6da0480b7..f8a3dc13cbbc 100644
--- a/include/sound/tas2781.h
+++ b/include/sound/tas2781.h
@@ -107,6 +107,8 @@
#define TASDEVICE_CMD_DELAY 0x3
#define TASDEVICE_CMD_FIELD_W 0x4
+#define TAS2781_ASUS_ID 0x10430000
+
enum audio_device {
TAS2563,
TAS2781,
@@ -156,6 +158,7 @@ struct tasdevice_priv {
struct tasdevice_rca rcabin;
struct calidata cali_data;
struct tasdevice_fw *fmw;
+ struct gpio_desc *speaker_id;
struct gpio_desc *reset;
struct mutex codec_lock;
struct regmap *regmap;
diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c
index 370d847517f9..1f71927825b2 100644
--- a/sound/pci/hda/tas2781_hda_i2c.c
+++ b/sound/pci/hda/tas2781_hda_i2c.c
@@ -615,7 +615,7 @@ static void tasdev_fw_ready(const struct firmware *fmw, void *context)
struct tasdevice_priv *tas_priv = context;
struct tas2781_hda *tas_hda = dev_get_drvdata(tas_priv->dev);
struct hda_codec *codec = tas_priv->codec;
- int i, ret;
+ int i, ret, spk_id;
pm_runtime_get_sync(tas_priv->dev);
mutex_lock(&tas_priv->codec_lock);
@@ -648,8 +648,23 @@ static void tasdev_fw_ready(const struct firmware *fmw, void *context)
tasdevice_dsp_remove(tas_priv);
tas_priv->fw_state = TASDEVICE_DSP_FW_PENDING;
- scnprintf(tas_priv->coef_binaryname, 64, "TAS2XXX%04X.bin",
- codec->core.subsystem_id & 0xffff);
+ if ((codec->core.subsystem_id & 0xffff0000) == TAS2781_ASUS_ID) {
+ // Speaker id need to be checked.
+ if (tas_priv->speaker_id)
+ spk_id = gpiod_get_value(tas_priv->speaker_id);
+ else
+ spk_id = 0;
+ if (spk_id < 0 || spk_id > 1) {
+ // Speaker id is not valid, use default.
+ dev_dbg(tas_priv->dev, "Wrong spk_id = %d\n", spk_id);
+ spk_id = 0;
+ }
+ scnprintf(tas_priv->coef_binaryname, 64, "TAS2XXX%04X%01d.bin",
+ codec->core.subsystem_id & 0xffff, spk_id);
+ } else {
+ scnprintf(tas_priv->coef_binaryname, 64, "TAS2XXX%04X.bin",
+ codec->core.subsystem_id & 0xffff);
+ }
ret = tasdevice_dsp_parser(tas_priv);
if (ret) {
dev_err(tas_priv->dev, "dspfw load %s error\n",
@@ -787,6 +802,15 @@ static void tas2781_hda_remove(struct device *dev)
tasdevice_remove(tas_hda->priv);
}
+static const struct acpi_gpio_params speakerid_gpios = { 0, 0, false };
+static const struct acpi_gpio_params interrupt_gpios = { 1, 0, false };
+
+static const struct acpi_gpio_mapping tas2781_speaker_id_gpios[] = {
+ { "speakerid-gpios", &speakerid_gpios, 1 },
+ { "interrupt-gpios", &interrupt_gpios, 1 },
+ { }
+};
+
static int tas2781_hda_i2c_probe(struct i2c_client *clt)
{
struct tas2781_hda *tas_hda;
@@ -823,6 +847,15 @@ static int tas2781_hda_i2c_probe(struct i2c_client *clt)
if (ret)
return dev_err_probe(tas_hda->dev, ret,
"Platform not supported\n");
+ ret = devm_acpi_dev_add_driver_gpios(tas_hda->dev,
+ tas2781_speaker_id_gpios);
+ if (ret)
+ dev_info(tas_hda->dev, "Unable to add GPIO mapping table\n");
+
+ tas_hda->priv->speaker_id = devm_gpiod_get(tas_hda->dev, "speakerid",
+ GPIOD_IN);
+ if (IS_ERR(tas_hda->priv->speaker_id))
+ dev_info(tas_hda->dev, "Failed to get Speaker id gpio.\n");
ret = tasdevice_init(tas_hda->priv);
if (ret)
--
2.43.0
next reply other threads:[~2024-10-11 8:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-11 8:53 Baojun Xu [this message]
2024-10-11 9:09 ` [PATCH v1] ALSA: hda/tas2781: Add speaker id check for ASUS projects Takashi Iwai
2024-10-11 9:19 ` Takashi Iwai
2024-10-11 11:07 ` Andy Shevchenko
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=20241011085303.738-1-baojun.xu@ti.com \
--to=baojun.xu@ti.com \
--cc=13916275206@139.com \
--cc=alsa-devel@alsa-project.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=broonie@kernel.org \
--cc=kevin-lu@ti.com \
--cc=lgirdwood@gmail.com \
--cc=liam.r.girdwood@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=navada@ti.com \
--cc=niranjan.hy@ti.com \
--cc=perex@perex.cz \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=robh+dt@kernel.org \
--cc=shenghao-ding@ti.com \
--cc=soyer@irl.hu \
--cc=tiwai@suse.de \
--cc=v-hampiholi@ti.com \
--cc=v-po@ti.com \
--cc=yung-chuan.liao@linux.intel.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