| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20250712081733.12881-1-baojun.xu@ti.com>
Date: Sat, 12 Jul 2025 16:17:33 +0800
From: Baojun Xu <baojun.xu@...com>
To: <tiwai@...e.de>
CC: <broonie@...nel.org>, <andriy.shevchenko@...ux.intel.com>,
<alsa-devel@...a-project.org>, <shenghao-ding@...com>, <navada@...com>,
<13916275206@....com>, <v-hampiholi@...com>, <v-po@...com>,
<linux-sound@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<baojun.xu@...com>
Subject: [PATCH v1] ALSA: hda/tas2781: Add TAS2770 support
Add TAS2770 support in HDA.
Create a header file include/sound/tas2770-tlv.h,
Set chip_id in i2c probe, check it while sound control is created,
and the DSP firmware binary file parser.
Signed-off-by: Baojun Xu <baojun.xu@...com>
---
include/sound/tas2770-tlv.h | 20 ++++++++++++
include/sound/tas2781.h | 4 +++
sound/pci/hda/tas2781_hda_i2c.c | 58 +++++++++++++++++++++++++--------
3 files changed, 69 insertions(+), 13 deletions(-)
create mode 100644 include/sound/tas2770-tlv.h
diff --git a/include/sound/tas2770-tlv.h b/include/sound/tas2770-tlv.h
new file mode 100644
index 000000000000..2a2a74372366
--- /dev/null
+++ b/include/sound/tas2770-tlv.h
@@ -0,0 +1,20 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+//
+// ALSA SoC Texas Instruments TAS2770 Audio Smart Amplifier
+//
+// Copyright (C) 2025 Texas Instruments Incorporated
+// https://www.ti.com
+//
+// The TAS2770 hda driver implements for one, two, or even multiple
+// TAS2770 chips.
+//
+// Author: Baojun Xu <baojun.xu@...com>
+//
+
+#ifndef __TAS2770_TLV_H__
+#define __TAS2770_TLV_H__
+
+static const __maybe_unused DECLARE_TLV_DB_SCALE(tas2770_dvc_tlv, 1650, 50, 0);
+static const __maybe_unused DECLARE_TLV_DB_SCALE(tas2770_amp_tlv, 1100, 50, 0);
+
+#endif
diff --git a/include/sound/tas2781.h b/include/sound/tas2781.h
index 3875e92f1ec5..f3d9c80fad36 100644
--- a/include/sound/tas2781.h
+++ b/include/sound/tas2781.h
@@ -63,6 +63,9 @@
/* Volume control */
#define TAS2563_DVC_LVL TASDEVICE_REG(0x00, 0x02, 0x0c)
+#define TAS2770_DVC_LVL TASDEVICE_REG(0x0, 0x0, 0x17)
+#define TAS2770_AMP_LEVEL TASDEVICE_REG(0x0, 0x0, 0x03)
+
#define TAS2781_DVC_LVL TASDEVICE_REG(0x0, 0x0, 0x1a)
#define TAS2781_AMP_LEVEL TASDEVICE_REG(0x0, 0x0, 0x03)
#define TAS2781_AMP_LEVEL_MASK GENMASK(5, 1)
@@ -111,6 +114,7 @@
enum audio_device {
TAS2563,
+ TAS2770,
TAS2781,
};
diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c
index b7ee22840d78..39f00e33e49d 100644
--- a/sound/pci/hda/tas2781_hda_i2c.c
+++ b/sound/pci/hda/tas2781_hda_i2c.c
@@ -24,6 +24,7 @@
#include <sound/tas2781.h>
#include <sound/tas2781-comlib-i2c.h>
#include <sound/tlv.h>
+#include <sound/tas2770-tlv.h>
#include <sound/tas2781-tlv.h>
#include "hda_local.h"
@@ -245,6 +246,12 @@ static int tas2781_force_fwload_put(struct snd_kcontrol *kcontrol,
return change;
}
+static const struct snd_kcontrol_new tas2770_snd_controls[] = {
+ ACARD_SINGLE_RANGE_EXT_TLV("Speaker Analog Volume", TAS2770_AMP_LEVEL,
+ 0, 0, 20, 0, tas2781_amp_getvol,
+ tas2781_amp_putvol, tas2770_amp_tlv),
+};
+
static const struct snd_kcontrol_new tas2781_snd_controls[] = {
ACARD_SINGLE_RANGE_EXT_TLV("Speaker Analog Gain", TAS2781_AMP_LEVEL,
1, 0, 20, 0, tas2781_amp_getvol,
@@ -253,7 +260,7 @@ static const struct snd_kcontrol_new tas2781_snd_controls[] = {
tas2781_force_fwload_get, tas2781_force_fwload_put),
};
-static const struct snd_kcontrol_new tas2781_prof_ctrl = {
+static const struct snd_kcontrol_new tas27xx_prof_ctrl = {
.name = "Speaker Profile Id",
.iface = SNDRV_CTL_ELEM_IFACE_CARD,
.info = tasdevice_info_profile,
@@ -393,26 +400,45 @@ static void tasdev_fw_ready(const struct firmware *fmw, void *context)
if (ret)
goto out;
- tas_hda->prof_ctl = snd_ctl_new1(&tas2781_prof_ctrl, tas_priv);
+ tas_hda->prof_ctl = snd_ctl_new1(&tas27xx_prof_ctrl, tas_priv);
ret = snd_ctl_add(codec->card, tas_hda->prof_ctl);
if (ret) {
dev_err(tas_priv->dev,
"Failed to add KControl %s = %d\n",
- tas2781_prof_ctrl.name, ret);
+ tas27xx_prof_ctrl.name, ret);
goto out;
}
- for (i = 0; i < ARRAY_SIZE(tas2781_snd_controls); i++) {
- hda_priv->snd_ctls[i] = snd_ctl_new1(&tas2781_snd_controls[i],
- tas_priv);
- ret = snd_ctl_add(codec->card, hda_priv->snd_ctls[i]);
- if (ret) {
- dev_err(tas_priv->dev,
- "Failed to add KControl %s = %d\n",
- tas2781_snd_controls[i].name, ret);
- goto out;
+ if (tas_priv->chip_id == TAS2770) {
+ for (i = 0; i < ARRAY_SIZE(tas2770_snd_controls); i++) {
+ hda_priv->snd_ctls[i] = snd_ctl_new1(
+ &tas2770_snd_controls[i], tas_priv);
+ ret = snd_ctl_add(codec->card, hda_priv->snd_ctls[i]);
+ if (ret) {
+ dev_err(tas_priv->dev,
+ "Failed to add KControl %s = %d\n",
+ tas2770_snd_controls[i].name, ret);
+ goto out;
+ }
+ }
+ } else if (tas_priv->chip_id == TAS2781) {
+ for (i = 0; i < ARRAY_SIZE(tas2781_snd_controls); i++) {
+ hda_priv->snd_ctls[i] = snd_ctl_new1(
+ &tas2781_snd_controls[i], tas_priv);
+ ret = snd_ctl_add(codec->card, hda_priv->snd_ctls[i]);
+ if (ret) {
+ dev_err(tas_priv->dev,
+ "Failed to add KControl %s = %d\n",
+ tas2781_snd_controls[i].name, ret);
+ goto out;
+ }
}
}
+ // No dsp supported in TAS2770.
+ if (tas_priv->chip_id == TAS2770) {
+ tas_hda->priv->playback_started = true;
+ goto out;
+ }
tasdevice_dsp_remove(tas_priv);
@@ -453,7 +479,6 @@ static void tasdev_fw_ready(const struct firmware *fmw, void *context)
tas2781_dsp_prog_ctrl.name, ret);
goto out;
}
-
tas_hda->dsp_conf_ctl = snd_ctl_new1(&tas2781_dsp_conf_ctrl,
tas_priv);
ret = snd_ctl_add(codec->card, tas_hda->dsp_conf_ctl);
@@ -582,15 +607,21 @@ static int tas2781_hda_i2c_probe(struct i2c_client *clt)
if (strstr(dev_name(&clt->dev), "TIAS2781")) {
device_name = "TIAS2781";
+ tas_hda->priv->chip_id = TAS2781;
hda_priv->save_calibration = tas2781_save_calibration;
tas_hda->priv->global_addr = TAS2781_GLOBAL_ADDR;
+ } else if (strstarts(dev_name(&clt->dev), "i2c-TXNW2770")) {
+ device_name = "TXNW2770";
+ tas_hda->priv->chip_id = TAS2770;
} else if (strstarts(dev_name(&clt->dev),
"i2c-TXNW2781:00-tas2781-hda.0")) {
device_name = "TXNW2781";
+ tas_hda->priv->chip_id = TAS2781;
hda_priv->save_calibration = tas2781_save_calibration;
tas_hda->priv->global_addr = TAS2781_GLOBAL_ADDR;
} else if (strstr(dev_name(&clt->dev), "INT8866")) {
device_name = "INT8866";
+ tas_hda->priv->chip_id = TAS2563;
hda_priv->save_calibration = tas2563_save_calibration;
tas_hda->priv->global_addr = TAS2563_GLOBAL_ADDR;
} else {
@@ -727,6 +758,7 @@ static const struct i2c_device_id tas2781_hda_i2c_id[] = {
static const struct acpi_device_id tas2781_acpi_hda_match[] = {
{"INT8866", 0 },
{"TIAS2781", 0 },
+ {"TXNW2770", 0 },
{"TXNW2781", 0 },
{}
};
--
2.43.0
Powered by blists - more mailing lists