Skip to content

Commit 2f6b927

Browse files
committed
ALSA: hda/tas2781: Add name prefix tas2781 for tas2781's dvc_tlv and amp_vol_tlv
JIRA: https://issues.redhat.com/browse/RHEL-118909 commit c0ed3c2 Author: Shenghao Ding <shenghao-ding@ti.com> Date: Sat Aug 16 12:27:41 2025 +0800 ALSA: hda/tas2781: Add name prefix tas2781 for tas2781's dvc_tlv and amp_vol_tlv With some new devices adding into the driver, dvc_tlv and amp_vol_tlv will cause confusion for customers on which devices they support. Fixes: 5be27f1 ("ALSA: hda/tas2781: Add tas2781 HDA driver") Signed-off-by: Shenghao Ding <shenghao-ding@ti.com> Link: https://patch.msgid.link/20250816042741.1659-1-shenghao-ding@ti.com Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <jkysela@redhat.com>
1 parent 6d87018 commit 2f6b927

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

include/sound/tas2781-tlv.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// ALSA SoC Texas Instruments TAS2781 Audio Smart Amplifier
44
//
5-
// Copyright (C) 2022 - 2024 Texas Instruments Incorporated
5+
// Copyright (C) 2022 - 2025 Texas Instruments Incorporated
66
// https://www.ti.com
77
//
88
// The TAS2781 driver implements a flexible and configurable
@@ -15,7 +15,7 @@
1515
#ifndef __TAS2781_TLV_H__
1616
#define __TAS2781_TLV_H__
1717

18-
static const __maybe_unused DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 50, 0);
19-
static const __maybe_unused DECLARE_TLV_DB_SCALE(amp_vol_tlv, 1100, 50, 0);
18+
static const __maybe_unused DECLARE_TLV_DB_SCALE(tas2781_dvc_tlv, -10000, 50, 0);
19+
static const __maybe_unused DECLARE_TLV_DB_SCALE(tas2781_amp_tlv, 1100, 50, 0);
2020

2121
#endif

sound/hda/codecs/side-codecs/tas2781_hda_i2c.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ static const struct snd_kcontrol_new tas2770_snd_controls[] = {
267267
static const struct snd_kcontrol_new tas2781_snd_controls[] = {
268268
ACARD_SINGLE_RANGE_EXT_TLV("Speaker Analog Volume", TAS2781_AMP_LEVEL,
269269
1, 0, 20, 0, tas2781_amp_getvol,
270-
tas2781_amp_putvol, amp_vol_tlv),
270+
tas2781_amp_putvol, tas2781_amp_tlv),
271271
ACARD_SINGLE_BOOL_EXT("Speaker Force Firmware Load", 0,
272272
tas2781_force_fwload_get, tas2781_force_fwload_put),
273273
};

sound/hda/codecs/side-codecs/tas2781_hda_spi.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,9 +494,11 @@ static int tas2781_force_fwload_put(struct snd_kcontrol *kcontrol,
494494

495495
static struct snd_kcontrol_new tas2781_snd_ctls[] = {
496496
ACARD_SINGLE_RANGE_EXT_TLV(NULL, TAS2781_AMP_LEVEL, 1, 0, 20, 0,
497-
tas2781_amp_getvol, tas2781_amp_putvol, amp_vol_tlv),
497+
tas2781_amp_getvol, tas2781_amp_putvol,
498+
tas2781_amp_tlv),
498499
ACARD_SINGLE_RANGE_EXT_TLV(NULL, TAS2781_DVC_LVL, 0, 0, 200, 1,
499-
tas2781_digital_getvol, tas2781_digital_putvol, dvc_tlv),
500+
tas2781_digital_getvol, tas2781_digital_putvol,
501+
tas2781_dvc_tlv),
500502
ACARD_SINGLE_BOOL_EXT(NULL, 0, tas2781_force_fwload_get,
501503
tas2781_force_fwload_put),
502504
};

sound/soc/codecs/tas2781-i2c.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -910,10 +910,10 @@ static const struct snd_kcontrol_new tasdevice_cali_controls[] = {
910910
static const struct snd_kcontrol_new tas2781_snd_controls[] = {
911911
SOC_SINGLE_RANGE_EXT_TLV("Speaker Analog Volume", TAS2781_AMP_LEVEL,
912912
1, 0, 20, 0, tas2781_amp_getvol,
913-
tas2781_amp_putvol, amp_vol_tlv),
913+
tas2781_amp_putvol, tas2781_amp_tlv),
914914
SOC_SINGLE_RANGE_EXT_TLV("Speaker Digital Volume", TAS2781_DVC_LVL,
915915
0, 0, 200, 1, tas2781_digital_getvol,
916-
tas2781_digital_putvol, dvc_tlv),
916+
tas2781_digital_putvol, tas2781_dvc_tlv),
917917
};
918918

919919
static const struct snd_kcontrol_new tas2781_cali_controls[] = {

0 commit comments

Comments
 (0)